From 71061fdcb33b8c26f5f8467cb3ac10704d65c87d Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 12 Dec 2023 11:02:18 +0000 Subject: [PATCH] ci: Re-add explicit Meson version to Alpine CI image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alpine 3.19 ships with Meson 1.3.0, which has broken handling of File objects and their paths. This causes (as far as I can tell) un-work-around-able breakage of GLib’s build. See https://github.com/mesonbuild/meson/issues/5273#issuecomment-1851811417 That should be fixed in Meson 1.4.0, but that might not be released for a while. Because we’re here to test GLib, not Meson, let’s pin the Meson version in the Alpine CI image to 1.2.3, which we know works and is reasonably up to date (and is what the other CI images use). Fixes this CI failure: https://gitlab.gnome.org/GNOME/glib/-/jobs/3361388 Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 2 +- .gitlab-ci/alpine.Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49ea6e373..ad5ee8254 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v24" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v18" - ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v2" + ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v3" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v14" MESON_TEST_TIMEOUT_MULTIPLIER: 4 G_MESSAGES_DEBUG: all diff --git a/.gitlab-ci/alpine.Dockerfile b/.gitlab-ci/alpine.Dockerfile index 352c2c6f9..8043a1075 100644 --- a/.gitlab-ci/alpine.Dockerfile +++ b/.gitlab-ci/alpine.Dockerfile @@ -25,6 +25,8 @@ RUN apk add --no-cache \ ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 MUSL_LOCPATH=/usr/share/i18n/locales/musl +RUN pip3 install --break-system-packages meson==1.2.3 + ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} RUN adduser -D -u $HOST_USER_ID -s /bin/bash user