diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc2932902..49ea6e373 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:v1" + ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v2" 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 145e3194c..352c2c6f9 100644 --- a/.gitlab-ci/alpine.Dockerfile +++ b/.gitlab-ci/alpine.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.19 RUN apk add --no-cache \ bash \ @@ -25,8 +25,6 @@ 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 diff --git a/glib/tests/meson.build b/glib/tests/meson.build index 829beb8f5..f6efc593a 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -113,8 +113,6 @@ glib_tests = { 'regex' : { 'dependencies' : [pcre2], 'c_args' : use_pcre2_static_flag ? ['-DPCRE2_STATIC'] : [], - # FIXME: musl: https://gitlab.gnome.org/GNOME/glib/-/issues/3159 - 'can_fail' : linux_libc == 'musl', }, 'relation' : {}, 'rwlock' : {},