From f2d24f0b1325a7735b1423f24ee6a163106368f1 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 6 May 2022 12:59:59 +0100 Subject: [PATCH] ci: Bump CI image versions for new Meson and libpcre versions As per the previous few commits. Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 10 +++++----- .gitlab-ci/coverity.Dockerfile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26428dfd0..633b3527d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,11 +10,11 @@ cache: - _ccache/ variables: - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v13" - COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v3" - DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v9" - ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v6" - MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v5" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v14" + COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v4" + DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v10" + ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v7" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v6" MESON_TEST_TIMEOUT_MULTIPLIER: 2 G_MESSAGES_DEBUG: all MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" diff --git a/.gitlab-ci/coverity.Dockerfile b/.gitlab-ci/coverity.Dockerfile index 2585711c5..0a474fc75 100644 --- a/.gitlab-ci/coverity.Dockerfile +++ b/.gitlab-ci/coverity.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v13 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v14 ARG COVERITY_SCAN_PROJECT_NAME ARG COVERITY_SCAN_TOKEN