From 041a4c67b4a67bda7ac377a987825226d47ec44a Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon, 9 Nov 2020 13:47:58 +0000
Subject: ci: Clean up the pipeline

Use common environment variables for the various jobs.
---
 .gitlab-ci.yml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6118483ab..359c4968a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,16 +3,20 @@ stages:
   - docs
   - deploy
 
+# Common variables
 variables:
   CCACHE_DIR: _ccache
+  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false"
+  LOADERS_FLAGS: "-Dpng=true -Djpeg=true -Dtiff=true"
+  MESON_TEST_TIMEOUT_MULTIPLIER: 3
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gdk-pixbuf/fedora:v1"
+
 
 .build-linux:
-  image: registry.gitlab.gnome.org/gnome/gdk-pixbuf/master:v2
-  stage: build
   before_script:
     - mkdir -p _ccache
   script:
-    - meson ${BUILD_OPTS} _build .
+    - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build .
     - ninja -C _build
   artifacts:
     when: on_failure
@@ -25,22 +29,25 @@ variables:
       - _ccache/
 
 meson-fedora-x86_64:
+  stage: build
   extends: .build-linux
-  variables:
-    BUILD_OPTS: "-Dpng=true -Djpeg=true -Dtiff=true -Djasper=true"
+  image: ${FEDORA_IMAGE}
   after_script:
-    - meson test -C _build -t 3
+    - meson test -C _build
 
 release-build:
+  stage: build
   extends: .build-linux
+  image: ${FEDORA_IMAGE}
   variables:
-    BUILD_OPTS: "-Dpng=true -Djpeg=true -Dtiff=true -Dbuildtype=release"
+    BUILD_OPTS: "-Dbuildtype=release"
   after_script:
-    - meson test -C _build -t 3
+    - meson test -C _build
 
 reference:
-  extends: .build-linux
   stage: docs
+  extends: .build-linux
+  image: ${FEDORA_IMAGE}
   variables:
     BUILD_OPTS: "-Dgtk_doc=true"
   after_script:
-- 
cgit v1.2.1