From 5a273556dffaf47eefe25a00b59b558a47249ca4 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 5 Dec 2023 09:53:04 +0000 Subject: [PATCH] ci: Install correct version of Meson on Alpine CI image The `latest` Alpine release contains Meson 1.1.0, but GLib depends on 1.2.0. This should fix https://gitlab.gnome.org/GNOME/glib/-/jobs/3343347 Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 2 +- .gitlab-ci/alpine.Dockerfile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4446f4e4d..dc2932902 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:v0" + ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v1" 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 be9ecfa70..145e3194c 100644 --- a/.gitlab-ci/alpine.Dockerfile +++ b/.gitlab-ci/alpine.Dockerfile @@ -15,6 +15,7 @@ RUN apk add --no-cache \ libxslt \ meson \ musl-locales \ + py3-pip \ python3 \ pcre2-dev \ shared-mime-info \ @@ -24,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