summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-10-14 14:13:49 +0000
committerMatthias Clasen <mclasen@redhat.com>2020-10-14 14:13:49 +0000
commitc7e6f369079f60311cf241e8e05f4cd92f7c344b (patch)
tree98b1f48aede68fd4f0846785f069d1fb84b4a5d1 /.gitlab-ci.yml
parent98566c9a4825513bb72f981ef347c1b3a56ac42d (diff)
parent8bb28bab74ac9c9e0c5012ad17c520e38ab5bd83 (diff)
downloadpango-c7e6f369079f60311cf241e8e05f4cd92f7c344b.tar.gz
Merge branch 'override-dependency' into 'master'
meson: Use meson.override_dependency() See merge request GNOME/pango!250
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c287010c..0d1433cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,10 @@ stages:
variables:
COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
MESON_TEST_TIMEOUT_MULTIPLIER: 2
+ FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v3
linux-fedora:
- image: registry.gitlab.gnome.org/gnome/pango/fedora:v2
+ image: $FEDORA_IMAGE
stage: build
needs: []
variables:
@@ -34,7 +35,7 @@ linux-fedora:
- "${CI_PROJECT_DIR}/_build/fontlist.txt"
asan-build:
- image: registry.gitlab.gnome.org/gnome/pango/fedora:v2
+ image: $FEDORA_IMAGE
tags: [ asan ]
stage: analysis
needs: []
@@ -78,7 +79,7 @@ msys2-mingw64:
- _build/fontlist.txt
reference:
- image: registry.gitlab.gnome.org/gnome/pango/fedora:v1
+ image: $FEDORA_IMAGE
stage: docs
needs: []
variables: