ci: Bump CI image versions for new Meson and libpcre versions

As per the previous few commits.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-05-06 12:59:59 +01:00
parent 749b65fd37
commit f2d24f0b13
2 changed files with 6 additions and 6 deletions

View File

@ -10,11 +10,11 @@ cache:
- _ccache/ - _ccache/
variables: variables:
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v13" FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v14"
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v3" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v4"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v9" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v10"
ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v6" ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v7"
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v5" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v6"
MESON_TEST_TIMEOUT_MULTIPLIER: 2 MESON_TEST_TIMEOUT_MULTIPLIER: 2
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"

View File

@ -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_PROJECT_NAME
ARG COVERITY_SCAN_TOKEN ARG COVERITY_SCAN_TOKEN