luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 11:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'alpine-3-19' into 'main'

Browse Source 
ci: update alpine CI container to 3.19

Closes #3159

See merge request GNOME/glib!3749
This commit is contained in:
Philip Withnall 2023-12-11 11:27:25 +00:00
commit 1024c9c32b
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -14,7 +14,7 @@ variables:
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v24" FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v24"
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v18" 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" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v14"
MESON_TEST_TIMEOUT_MULTIPLIER: 4 MESON_TEST_TIMEOUT_MULTIPLIER: 4
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all

4
.gitlab-ci/alpine.Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:latest FROM alpine:3.19
RUN apk add --no-cache \ RUN apk add --no-cache \
bash \ 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 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 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}
RUN adduser -D -u $HOST_USER_ID -s /bin/bash user RUN adduser -D -u $HOST_USER_ID -s /bin/bash user

2
glib/tests/meson.build
View File

@ -113,8 +113,6 @@ glib_tests = {
'regex' : { 'regex' : {
'dependencies' : [pcre2], 'dependencies' : [pcre2],
'c_args' : use_pcre2_static_flag ? ['-DPCRE2_STATIC'] : [], 'c_args' : use_pcre2_static_flag ? ['-DPCRE2_STATIC'] : [],
# FIXME: musl: https://gitlab.gnome.org/GNOME/glib/-/issues/3159
'can_fail' : linux_libc == 'musl',
}, },
'relation' : {}, 'relation' : {},
'rwlock' : {}, 'rwlock' : {},