[meld/flatpak-ci] Experimental pass at flatpak CI

[Kai Willadsen <kaiw src gnome org>]

commit dea3af2420def813a428ed3a51320b958795f202
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Sep 29 07:20:00 2019 +1000

    Experimental pass at flatpak CI

 .gitlab-ci.yml | 54 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d64e1ec..4f758761 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,32 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
+image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+
 stages:
   - check
-  - build
+  - test
+  - deploy
+  - build-windows
 
 variables:
-  DEPENDENCIES: python3
-                python3-pip
-                python3-pytest
-                python3-gobject
-                gobject-introspection
-                gtk3
-                gtksourceview4
-                intltool
-                glib2-devel
+    BUNDLE: "meld-dev.flatpak"
+    DEPENDENCIES: python3
+                  python3-pip
+                  python3-pytest
+                  python3-gobject
+                  gobject-introspection
+                  gtk3
+                  gtksourceview4
+                  glib2-devel
 
-.linux-common: &linux-common
-  image: fedora:rawhide
-  before_script:
-    - dnf update -y
-    - dnf install -y $DEPENDENCIES
+flatpak:
+    variables:
+        MANIFEST_PATH: "data/org.gnome.meld-devel.json"
+        MESON_ARGS: "-Dprofile=Devel"
+        FLATPAK_MODULE: "meld"
+        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
+        APP_ID: "org.gnome.meld-devel"
+    extends: .flatpak
 
 flake8:
   stage: check
@@ -25,22 +34,17 @@ flake8:
     - pip3 install -r dev-requirements.txt
     - flake8 bin/meld meld/
   allow_failure: true
-  <<: *linux-common
 
-linux-pytest:
+pytest:
   stage: check
+  before_script:
+    - dnf update -y
+    - dnf install -y $DEPENDENCIES
   script:
     - py.test-3 test/
-  <<: *linux-common
-
-linux-build:
-  stage: build
-  script:
-    - python3 setup.py build
-  <<: *linux-common
 
 .mingw-common: &mingw-common
-  stage: build
+  stage: build-windows
   tags: # select gitlab runners with specific tag (unrelated to git repo tags)
     - win32
   artifacts: