[gtk/ebassi/ci-cleanup-master: 1/2] ci: Move images into environment variables
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/ebassi/ci-cleanup-master: 1/2] ci: Move images into environment variables
- Date: Wed, 17 Jun 2020 12:35:00 +0000 (UTC)
commit 86562a6c5a8d1b667fc240869a7542e7fc3d123f
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Jun 8 11:00:20 2020 +0100
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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]