[polari] ci: Special-case master branch for flatpak bundles

[Florian Müllner <fmuellner src gnome org>]

commit 9215a0768009c0dd167561bd4bb582fd691a3806
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Sep 18 22:59:50 2019 +0200

    ci: Special-case master branch for flatpak bundles
    
    The snapshot builds we do for review are only really relevant
    for merge requests. In particular we don't want to publish them
    as nightly builds, which we'll soon do for the flatpaks built
    from the master branch.
    
    https://gitlab.gnome.org/GNOME/polari/merge_requests/135

 .gitlab-ci.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c1ecfb..876eafb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,21 +35,30 @@ eslint:
             - ${LINT_LOG}
         when: on_failure
 
-flatpak:
+.flatpak-template:
     stage: build
     variables:
         # Your manifest path
         MANIFEST_PATH: "flatpak/org.gnome.Polari.json"
         RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
         FLATPAK_MODULE: "polari"
-        BRANCH: "snapshot"
-        # Make sure to keep this in sync with the Flatpak manifest, all arguments
-        # are passed except the config-args because we build it ourselves
-        MESON_ARGS: "-Dsnapshot=true --werror --warnlevel 2"
         APP_ID: "org.gnome.Polari"
     extends: .flatpak
     <<: *only_default
 
+flatpak:
+    variables:
+        BRANCH: "snapshot"
+        MESON_ARGS: "-Dsnapshot=true --werror --warnlevel 2"
+    extends: .flatpak-template
+    except:
+        - master
+
+flatpak-master:
+    extends: .flatpak-template
+    only:
+        - master
+
 review:
     stage: review
     dependencies: