[meld/flatpak-ci] CI: Put flatpak creation in a custom stage for ordering

[Kai Willadsen <kaiw src gnome org>]

commit ddabed07d11389c80bf51351608496908213a639
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Dec 30 11:38:48 2019 +1000

    CI: Put flatpak creation in a custom stage for ordering
    
    By default this happens in .pre, which appears to come before anything
    else... but we would definitely prefer to run linting hooks and unit
    tests prior to doing the flatpak build.

 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 867f45c0..8515e18f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,9 @@ image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
 stages:
   - check
   - test
-  - deploy
+  - build-flatpak
   - build-windows
+  - deploy
 
 variables:
     BUNDLE: "meld-dev.flatpak"
@@ -20,13 +21,14 @@ variables:
                   glib2-devel
 
 flatpak:
+    extends: .flatpak
+    stage: build-flatpak
     variables:
         MANIFEST_PATH: "data/org.gnome.MeldDevel.json"
         MESON_ARGS: "-Dprofile=Devel"
         FLATPAK_MODULE: "meld"
         RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
         APP_ID: "org.gnome.MeldDevel"
-    extends: .flatpak
 
 nightly:
   extends: '.publish_nightly'