luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'alpine-meson' into 'main'

Browse Source 
ci: Re-add explicit Meson version to Alpine CI image

See merge request GNOME/glib!3757
This commit is contained in:
Michael Catanzaro 2023-12-12 16:45:18 +00:00
commit 3245a8f3dc
2 changed files with 3 additions and 1 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"
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

2
.gitlab-ci/alpine.Dockerfile
View File

@ -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