From 84a30e9524f5de5020fb93337b0e4d2813eafa7d Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 11 Apr 2018 17:45:29 +0100
Subject: [PATCH] ci: Use a common section for Flatpak jobs

Avoid repeating blobs of YAML manually, and use the proper YAML
mechanism to copy-paste blobs instead.
---
 .gitlab-ci.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fc36b09f7..657360d8ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,24 +42,23 @@ msys2-mingw32:
     CHERE_INVOKING: "yes"
   <<: *mingw-defaults
 
-flatpak:demo:
+.flatpak-defaults: &flatpak-defaults
   image: registry.gitlab.com/alatiera/gnome-nightly-oci/gnome-master:latest
   stage: flatpak
-  script:
-    - bash -x ./.gitlab-ci/flatpak-build.sh org.gtk.Demo
   artifacts:
     paths:
-      - org.gtk.Demo-dev.flatpak
+      - "${APPID}-dev.flatpak"
     expire_in: 1 day
   allow_failure: true
+  script:
+    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
+
+flatpak:demo:
+  variables:
+    APPID: org.gtk.Demo
+  <<: *flatpak-defaults
 
 flatpak:widget-factory:
-  image: registry.gitlab.com/alatiera/gnome-nightly-oci/gnome-master:latest
-  stage: flatpak
-  script:
-    - bash -x ./.gitlab-ci/flatpak-build.sh org.gtk.WidgetFactory
-  artifacts:
-    paths:
-      - org.gtk.WidgetFactory-dev.flatpak
-    expire_in: 1 day
-  allow_failure: true
+  variables:
+    APPID: org.gtk.WidgetFactory
+  <<: *flatpak-defaults