Ws15 patroni -> workshop_patroni

.gitignore

@@ -2,13 +2,19 @@ _build/*
 exports/*
 *.sw?
 .~lock.*
-*.json
-*.html
-*.reveal.html
-*.tex
-*.beamer.pdf
-*.pdf
-*.odt
-*.doc
-*.epub
-*.handout.html
+
+fr/**/*.json
+fr/**/*.html
+fr/**/*.tex
+fr/**/*.pdf
+fr/**/*.odt
+fr/**/*.doc
+fr/**/*.epub
+
+en/**/*.json
+en/**/*.html
+en/**/*.tex
+en/**/*.pdf
+en/**/*.odt
+en/**/*.doc
+en/**/*.epub

.gitlab-ci.yml

@@ -5,20 +5,26 @@
 ## I N C L U D E S
 ##
 
-# How To Export artefacts to the private environment
 include:
+  # Export artefacts to the private environment
   - project: 'dalibo/gitlab-templates'
     file: 'artifacts_private_env.yml'
+  # Export artefacts to the public environment  
+  - project: 'dalibo/gitlab-templates'
+    file: 'artifacts_public_env.yml'
+
 
 ##
 ## V A R I A B L E S
 ##
 
 variables:
+  BRANCH_TARGET: patroni
+  MASTER_TARGET: all
   # $ARTIFACTS is required by artefacts_private_env.yml
-  ARTIFACTS: '*'  
-  # 
-  THEMES_BRANCH: stable # usually 'stable' or 'master'
+  ARTIFACTS: '_build/*'
+  # THEMES_BRANCH is usually 'stable' or 'master'
+  THEMES_BRANCH: master
 
 
 before_script:
@@ -33,7 +39,7 @@ before_script:
 # We use the same image for all jobs
 #
 image:
-  name: dalibo/pandocker:19.11 # usually 'stable' or 'latest' (=master)
+  name: dalibo/pandocker:20.02 # usually 'stable' or 'latest' (=master)
   entrypoint: [""]  # we need to override the image entrypoint
 
 
@@ -43,38 +49,47 @@ image:
 
 pandoc:
   stage: build
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      variables:
+        TARGET: $MASTER_TARGET
+        ACTION: archives
+        MESSAGE: "All archived and active workshops will be published."
+    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+      variables:
+        TARGET: $BRANCH_TARGET
+        ACTION: deploy
+        MESSAGE: "Only $BRANCH_TARGET will be published."
+
   script:
     #
     # The dalibo themes are not mandatory
     # CI should be able to run without it
     #
     - > 
         if [[ $GITLAB_DEPLOY_PRIVATE_KEY ]] ; then 
-                ssh-add <(echo "$GITLAB_DEPLOY_PRIVATE_KEY")
-                git clone -b $THEMES_BRANCH git@gitlab.dalibo.info:marketing/themes.git
-                make --directory=themes install
+          ssh-add <(echo "$GITLAB_DEPLOY_PRIVATE_KEY")
+          git clone -b $THEMES_BRANCH git@gitlab.dalibo.info:marketing/themes.git
+          make --directory=themes install
         fi
     # pandoc
-    - make all
+    - echo $MESSAGE
+    - make $TARGET
+    - echo "Move html and pdf files to root directories"
+    - make $ACTION
 
   artifacts:
     paths:
-      - fr/
-      - en/
+      - _build/fr/
+      - _build/en/
     expire_in: 1 day
 
 ##
-##  D E P L O Y 
+## D E P L O Y
 ##
 
-## Export the master branch in a public location  
-public:
-  stage: deploy
-  script:
-    ## Install Deploy Key
-    - ssh-add <(echo "$CLOUD_DEPLOY_PRIVATE_KEY")
-    ## Push
-    - rsync -avp fr $CLOUD_DEPLOY_DEST
-    - rsync -avp en $CLOUD_DEPLOY_DEST
-  only:
-    - master@formation/workshops
+# overiding the job template because we need to force GIT_STRATEGY 
+# for this pipeline in order to deploy `_archives`
+public_env:
+  variables:
+    GIT_STRATEGY: fetch

AUTHORS.md

@@ -6,10 +6,14 @@ order:
 
 * Alexandre Anriot <alexandre@atlantilde.com>
 * Adrien Nayrat <adrien.nayrat@dalibo.com>
-* damien clochard <damien.clochard@dalibo.com>
+* Damien Clochard <damien.clochard@dalibo.com>
 * Guillaume Lelarge <guillaume.lelarge@dalibo.com>
 * Thibaut Madelaine <thibaut.madelaine@dalibo.com>
 * Nicolas Gollet <nicolas.gollet@dalibo.com>
 * Nicolas Thauvin <nicolas.thauvin@dalibo.com>
 * Stefan Fercot <stefan.fercot@dalibo.com>
 * Thomas Reiss <thomas.reiss@dalibo.com>
+* Benoit Lobréau <benoit.lobreau@dalibo.com>
+* Christophe Courtois <christophe.courtois@dalibo.com>
+* Thibaud Walkowiak
+* Franck Boudehen