[gnome-build-meta] .gitlab-ci.yml: fix flatpak publishing

[Abderrahim Kitouni <akitouni src gnome org>]

commit 2650c2e243b42b726615ae524f98ab23bd76009b
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Jun 12 21:15:27 2019 +0100

    .gitlab-ci.yml: fix flatpak publishing
    
    - do not run the publish prepare/finish when building from tags
    - correctly exclude publishing when BST_TRACK_TAG is modified
    
    From the documentation:
    
    The logic is: (any of refs) AND (any of variables) AND (any of changes) AND (if kubernetes is active)

 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcc2f50b..4718fdb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,14 +102,12 @@ before_script:
     - flatpak build-update-repo --generate-static-deltas repo/
     - flat-manager/flat-manager-client push $(cat build.txt) repo/
   only:
-    refs:
-      - master
-      - /^gnome-\d-\d\d$/
-    variables:
-      - $BST_TRACK_TAG == "False"
+    - master
+    - /^gnome-\d-\d\d$/
   except:
     variables:
       - $EMERGENCY
+      - $BST_TRACK_TAG != "False"
 
 #
 # Architecture specific settings
@@ -201,6 +199,7 @@ flatpak-prepare:
   except:
     variables:
       - $EMERGENCY
+      - $BST_TRACK_TAG != "False"
   <<: *x86_64
 
 
@@ -234,6 +233,7 @@ flatpak-finish:
   except:
     variables:
       - $EMERGENCY
+      - $BST_TRACK_TAG != "False"
   <<: *x86_64
 
 flatpak-finish-failed:
@@ -248,6 +248,7 @@ flatpak-finish-failed:
   except:
     variables:
       - $EMERGENCY
+      - $BST_TRACK_TAG != "False"
   <<: *x86_64