[gnome-maps/ci/extends-flatpak] gitlab-ci: Extend .flatpak

[Marcus Lundblad <mlundblad src gnome org>]

commit 3fbdbd72d81fba9d4c2a40e15d3997040796d17d
Author: Marcus Lundblad <ml update uu se>
Date:   Fri Feb 21 12:03:53 2020 +0100

    gitlab-ci: Extend .flatpak

 .gitlab-ci.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29e91e51..590c8c8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
 stages:
 - test
 - review
@@ -6,7 +8,11 @@ variables:
     # Replace with your preferred file name of the resulting Flatpak bundle
     BUNDLE: "gnome-maps-git.flatpak"
 
+tags:
+    - flatpak
+
 flatpak:
+    extends: .flatpak
     image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
     stage: test
     variables:
@@ -19,18 +25,6 @@ flatpak:
         # are passed except the config-args because we build it ourselves
         MESON_ARGS: ""
         DBUS_ID: "org.gnome.Maps"
-
-    script:
-        - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-        # Make sure to keep this in sync with the Flatpak manifest, all arguments
-        # are passed except the config-args because we build it ourselves
-        - flatpak build app meson --prefix=/app ${MESON_ARGS} _build
-        - flatpak build app ninja -C _build install
-        - flatpak-builder --user --disable-rofiles-fuse --finish-only --repo=repo app ${MANIFEST_PATH}
-        # Generate a Flatpak bundle
-        - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
-        # Run automatic tests inside the Flatpak env
-        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
     artifacts:
         paths:
             - ${BUNDLE}