[gnome-build-meta/abderrahim/gitlab-ci-rules: 193/194] .gitlab-ci.yml: use rules instead of only/except

[Abderrahim Kitouni <akitouni src gnome org>]

commit 58e0dc582fb043efd722e7295b0af7aeaab4cd0b
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Oct 3 20:16:49 2019 +0100

    .gitlab-ci.yml: use rules instead of only/except

 .gitlab-ci.yml | 56 +++++++++++++++++++++-----------------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1adda7cb..ff420818 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,13 +134,10 @@ default:
   - flatpak build-update-repo --generate-static-deltas repo/
 
   - flat-manager-client push $(cat build.txt) repo/
-  only:
-  - master
-  - /^gnome-\d-\d\d$/
-  except:
-    variables:
-    - $EMERGENCY
-    - $BST_TRACK_TAGS != "False"
+  rules:
+  - if: $EMERGENCY || $BST_TRACK_TAGS != "False"
+    when: never
+  - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d-\d\d$/
 
 #
 # Architecture specific settings
@@ -191,9 +188,8 @@ track:
   - ${BST} track --deps all core.bst flatpak-runtimes.bst vm/image.bst
   retry: 2
   # only run on branches targeting master
-  only:
-    variables:
-    - $FLATPAK_BRANCH == 'master'
+  rules:
+  - if: $FLATPAK_BRANCH == 'master' && $CI_MERGE_REQUEST_ID == null
   cache: *bst-cache
   artifacts: *logging-artifacts
 
@@ -223,13 +219,10 @@ flatpak-prepare:
   artifacts:
     paths:
     - build.txt
-  only:
-  - master
-  - /^gnome-\d-\d\d$/
-  except:
-    variables:
-    - $EMERGENCY
-    - $BST_TRACK_TAGS != "False"
+  rules:
+  - if: $EMERGENCY || $BST_TRACK_TAGS != "False"
+    when: never
+  - if: $CI_COMMIT_REF_NAME == 'master' || $CI_COMMIT_REF_NAME ~= /^gnome-\d-\d\d$/
   <<: *x86_64
 
 
@@ -257,13 +250,10 @@ flatpak-finish:
   - flat-manager-client commit --wait $(cat build.txt)
   - flat-manager-client publish --wait $(cat build.txt)
   - flat-manager-client purge $(cat build.txt)
-  only:
-  - master
-  - /^gnome-\d-\d\d$/
-  except:
-    variables:
-    - $EMERGENCY
-    - $BST_TRACK_TAGS != "False"
+  rules:
+  - if: $EMERGENCY || $BST_TRACK_TAGS != "False"
+    when: never
+  - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME ~= /^gnome-\d-\d\d$/
   <<: *x86_64
 
 flatpak-finish-failed:
@@ -271,14 +261,11 @@ flatpak-finish-failed:
   dependencies: [flatpak-prepare]
   script:
   - flat-manager-client purge $(cat build.txt)
-  when: on_failure
-  only:
-  - master
-  - /^gnome-\d-\d\d$/
-  except:
-    variables:
-    - $EMERGENCY
-    - $BST_TRACK_TAGS != "False"
+  rules:
+  - if: $EMERGENCY || $BST_TRACK_TAGS != "False"
+    when: never
+  - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d-\d\d$/
+    when: on_failure
   <<: *x86_64
 
 
@@ -306,6 +293,5 @@ cve_report:
   artifacts:
     paths:
     - cve-reports
-  only:
-  - master
-  - /^gnome-\d-\d\d$/
+  rules:
+  - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d-\d\d$/