mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-25 11:42:10 +01:00
Merge branch 'alpine-3-19' into 'main'
ci: update alpine CI container to 3.19 Closes #3159 See merge request GNOME/glib!3749
This commit is contained in:
commit
1024c9c32b
@ -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
|
||||
|
@ -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
|
||||
|
@ -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' : {},
|
||||
|
Loading…
x
Reference in New Issue
Block a user