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
This commit is contained in:
Marco Trevisan (Treviño) 2024-05-24 18:54:54 +02:00
parent 2665a34b3f
commit 64f7445232
2 changed files with 4 additions and 4 deletions

View File

@ -11,11 +11,11 @@ cache:
- _ccache/ - _ccache/
variables: 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" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v19" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v19"
ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v3" 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 MESON_TEST_TIMEOUT_MULTIPLIER: 4
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:v27 FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.1
USER root USER root
@ -14,4 +14,4 @@ WORKDIR /opt
COPY cross_file_mingw64.txt /opt COPY cross_file_mingw64.txt /opt
USER user USER user
WORKDIR /home/user WORKDIR /home/user