ci: transition from gitlab only syntax to new if syntax

Sieboldianus · May 12, 2020 · fd9c011 · fd9c011
1 parent a1d3e00
commit fd9c011
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -53,10 +53,12 @@ test:
       - '*.svg'
       - docs/argparse/args.md
       - docs/api/
-  only:
-  - master
-  - ci-test
-
+  rules:
+    # always execute on master or ci-test
+    - if:
+        $CI_COMMIT_BRANCH == "master" ||
+        $CI_COMMIT_BRANCH == "ci-test"
+
 mkdocs:
   stage: mkdocs
   image: registry.gitlab.vgiscience.org/tud_ifk/alpine-mkdocs
@@ -73,9 +75,11 @@ mkdocs:
     name: pages
     paths:
     - public
-  only:
-  - master
-  - ci-test
+  rules:
+    # always execute on master or ci-test
+    - if:
+        $CI_COMMIT_BRANCH == "master" ||
+        $CI_COMMIT_BRANCH == "ci-test"
 
 rsync:
   stage: deploy
@@ -88,5 +92,6 @@ rsync:
   script:
   - ssh "${STAGING_SERVER}" mkdir -p "${STAGING_PATH}${REL_NAMESPACE}"
   - rsync -avu -zz --no-perms --omit-dir-times --del --chown=www-data:www-data --chmod=D775,F664 "public/${REL_NAMESPACE}" "${STAGING_SERVER}:${STAGING_PATH}${REL_NAMESPACE}"
-  only:
-  - master
+  rules:
+    # always execute on master or ci-test
+    - if: $CI_COMMIT_BRANCH == "master"