From 64f744523202954f2dea466b00110e851640bd1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 24 May 2024 18:54:54 +0200 Subject: [PATCH] ci: Actually use a fedora 39 image Also start using a more reliable versioning scheme for the fedora images so that the tag is always vFEDORA_VERSION.IMAGE_VERSION to make it easier to understand on future updates Fixes: #3381 --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/mingw.Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ea475a8f..aa706c123 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,11 +11,11 @@ cache: - _ccache/ variables: - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v27" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.1" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v19" ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v3" - MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v16" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.1" MESON_TEST_TIMEOUT_MULTIPLIER: 4 G_MESSAGES_DEBUG: all MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index fde9550d0..64ad06e72 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v27 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.1 USER root @@ -14,4 +14,4 @@ WORKDIR /opt COPY cross_file_mingw64.txt /opt USER user -WORKDIR /home/user \ No newline at end of file +WORKDIR /home/user