From 86562a6c5a8d1b667fc240869a7542e7fc3d123f Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon, 8 Jun 2020 11:00:20 +0100
Subject: [PATCH 1/2] ci: Move images into environment variables

Currently we have to hunt all the `image` keys when updating the image
in use for a job. We should centralise them all at the top of the file,
so they are easy to update in one simple change.
---
 .gitlab-ci.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4465cff4f..cafd0f38b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,9 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v17"
+  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"
 
 .only-default:
   only:
@@ -27,14 +30,14 @@ variables:
 
 style-check-diff:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
+  image: $FEDORA_IMAGE
   stage: .pre
   allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
+  image: $FEDORA_IMAGE
   artifacts:
     when: always
     reports:
@@ -117,7 +120,7 @@ msys2-mingw64:
     CHERE_INVOKING: "yes"
 
 .flatpak-defaults:
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+  image: $FLATPAK_IMAGE
   stage: flatpak
   allow_failure: true
   tags:
@@ -171,7 +174,7 @@ flatpak-master:icon-browser:
     APPID: org.gtk.IconBrowser4
 
 static-scan:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  image: $FEDORA_IMAGE
   stage: analysis
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
@@ -184,7 +187,7 @@ static-scan:
   allow_failure: true
 
 reference:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19
+  image: $DOCS_IMAGE
   stage: docs
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"

From 73fdefd65c9c144067df45033e46d08c4dc9eadd Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon, 8 Jun 2020 11:35:49 +0100
Subject: [PATCH 2/2] ci: Move backend Meson flags into a variable

So we don't have to copy them around.
---
 .gitlab-ci.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cafd0f38b6..a97f203c63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ stages:
 # Common variables
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
+  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
   FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v17"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
@@ -69,11 +70,7 @@ fedora-x86_64:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
-            -Dx11-backend=true
-            -Dwayland-backend=true
-            -Dbroadway-backend=true
-            -Dvulkan=yes
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS}
             -Dprofiler=true
             _build
     - ninja -C _build
@@ -87,11 +84,7 @@ release-build:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
-            -Dx11-backend=true
-            -Dwayland-backend=true
-            -Dbroadway-backend=true
-            -Dvulkan=yes
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS}
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11