From 21fa4ea91ba65b61c37dc07e2c8924baa7f14a82 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 15 May 2024 10:33:00 +0100 Subject: [PATCH] ci: Update Fedora CI image to Fedora 39 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fedora 37 is out of support so, as per our policy, update the CI image to the oldest still-supported release, which is 39. Update the mingw CI image too, as it’s built on top of the Fedora one. Update the supported platforms documentation (and fix the Debian version listed there to match what’s currently in CI, which is up to date). Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/fedora.Dockerfile | 2 +- .gitlab-ci/mingw.Dockerfile | 2 +- docs/supported-platforms.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3be797d21..12da6ee55 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:v26" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v27" 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:v15" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v16" 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/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 3713cc357..f13f0427e 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:37 +FROM fedora:39 RUN dnf -y update \ && dnf -y install \ diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index d688a35a1..fde9550d0 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v25 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v27 USER root diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md index f883f74b2..baaef70a4 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md @@ -38,8 +38,8 @@ GLib is regularly built on at least the following systems: * FreeBSD: https://wiki.gnome.org/Projects/Jhbuild/FreeBSD * openSUSE: https://build.opensuse.org/package/show/GNOME:Factory/glib2 * CI runners, https://gitlab.gnome.org/GNOME/glib/blob/main/.gitlab-ci.yml: - - Fedora (34, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/fedora.Dockerfile) - - Debian (Bullseye, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/debian-stable.Dockerfile) + - Fedora (39, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/fedora.Dockerfile) + - Debian (Bookworm, https://gitlab.gnome.org/GNOME/glib/-/blob/main/.gitlab-ci/debian-stable.Dockerfile) - Windows (MinGW64) - Windows (msys2-mingw32 and msys2-clang64; msys2 is a rolling release distribution) - Windows (Visual Studio 2017, and a static linking version)