[meld: 1/4] win32, gitlab-ci: run windows build in parallel with flatpak

[Kai Willadsen <kaiw src gnome org>]

commit 3eb93dfd7e2b61649a9ea6b07270cef829b03eee
Author: Vasily Galkin <galkin-vv ya ru>
Date:   Fri Feb 21 00:09:18 2020 +0000

    win32, gitlab-ci: run windows build in parallel with flatpak
    
    To speedup pipeline as a whole the windows builds
    and flatpak builds are put in the same stage.
    Conceptually the are similar - creating plaform-specific packages,
    and both takes near 2 minutes
    
    Also the extending syntax updated to "extends:" gitlab feature.

 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8515e18f..2a13bb83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,7 @@ image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
 stages:
   - check
   - test
-  - build-flatpak
-  - build-windows
+  - build
   - deploy
 
 variables:
@@ -22,7 +21,7 @@ variables:
 
 flatpak:
     extends: .flatpak
-    stage: build-flatpak
+    stage: build
     variables:
         MANIFEST_PATH: "data/org.gnome.MeldDevel.json"
         MESON_ARGS: "-Dprofile=Devel"
@@ -50,8 +49,8 @@ pytest:
   script:
     - py.test-3 test/
 
-.mingw-common: &mingw-common
-  stage: build-windows
+.mingw-common:
+  stage: build
   tags: # select gitlab runners with specific tag (unrelated to git repo tags)
     - win32
   artifacts:
@@ -69,13 +68,13 @@ pytest:
   allow_failure: true
 
 mingw64-dist:
+  extends: .mingw-common
   variables:
     MSYS2_ARCH: x86_64
     MSYSTEM: MINGW64
-  <<: *mingw-common
 
 mingw32-dist:
+  extends: .mingw-common
   variables:
     MSYS2_ARCH: i686
     MSYSTEM: "MINGW32"
-  <<: *mingw-common