Merge branch 'develop'

.gitlab-ci.yml

@@ -15,12 +15,16 @@ retrieve:repo:
     expire_in: 1 day
     paths:
       - courses.lcsb.uni.lu
+  rules:
+    - if: $CI_COMMIT_BRANCH == "develop"
+    - if: $CI_COMMIT_BRANCH == "master"
 
 generate:index:
   image: python
   stage: generate
   rules:
     - if: $CI_COMMIT_BRANCH == "develop"
+    - if: $CI_COMMIT_BRANCH == "master"
   script:
     - python .ci/generateIndex.py
   artifacts:
@@ -31,6 +35,9 @@ generate:index:
 build:website:
   image: git-r3lab.uni.lu:4567/r3/docker/jekyll-lcsb
   stage: build
+  rules:
+    - if: $CI_COMMIT_BRANCH == "develop"
+    - if: $CI_COMMIT_BRANCH == "master"
   before_script:
     - cd courses.lcsb.uni.lu
     - gem install bundler -v2.0.2
@@ -53,6 +60,7 @@ build:courses:
   stage: build
   rules:
     - if: $CI_COMMIT_BRANCH == "develop"
+    - if: $CI_COMMIT_BRANCH == "master"
   before_script:
     - git submodule update --recursive --init
   script:
@@ -74,7 +82,8 @@ upload:
     - echo "$KNOWNHOSTS" > ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   rules:
-    - if: '$CI_COMMIT_BRANCH == "develop"'
+    - if: $CI_COMMIT_BRANCH == "develop"
+    - if: $CI_COMMIT_BRANCH == "master"
   script:
     - scp -P $SSHPORT -r site/* $SSHCONNECT:~/web/latest
     - scp -P $SSHPORT -r public/* $SSHCONNECT:~/web/latest