From e11b42fb34f26426c376bd9793f4d0933cdc4dae Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Thu, 7 Sep 2023 16:07:56 +0200
Subject: [PATCH] merge main
---
.gitlab-ci.yml | 20 ++++++++++++++++++--
content/0.index.md | 42 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e5db143..565c8041 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,30 @@
# The Docker image that will be used to build your app
image: node:19.5-bullseye-slim
# Functions that should be executed before the build script is run
-before_script:
- - npm ci
cache:
paths:
- node_modules/
+stages:
+ - build
+ - deploy
+
+build:
+ stage: build
+ before_script:
+ - npm ci
+ script:
+ - NUXT_APP_BASE_URL=/wiki/ npm run generate
+ artifacts:
+ paths:
+ - .output/public
+ untracked: false
+ when: on_success
+ expire_in: "30 days"
+
pages:
+ stage: deploy
only:
- main
script:
diff --git a/content/0.index.md b/content/0.index.md
index c38d4ac5..e3f71907 100644
--- a/content/0.index.md
+++ b/content/0.index.md
@@ -58,4 +58,44 @@ items:
- 10.1038/s41586-019-1894-8
- 10.1128/jb.64.4.557-569.1952
---
-::
\ No newline at end of file
+<<<<<<< HEAD
+::
+=======
+#title
+DefenseFinder Wiki
+
+#description
+A comprehensive effort to map microbial defense systems against their viruses
+::
+
+
+
+
+::card-grid
+#title
+What's included
+
+#root
+:ellipsis
+
+#default
+ ::card
+ #title
+ Nuxt Architecture.
+ #description
+ Harness the full power of Nuxt and the Nuxt ecosystem.
+ ::
+ ::card
+ #title
+ Vue Components.
+ #description
+ Use built-in components (or your own!) inside your content.
+ ::
+ ::card
+ #title
+ Write Markdown.
+ #description
+ Enjoy the ease and simplicity of Markdown and discover MDC syntax.
+ ::
+::
+>>>>>>> main
--
GitLab