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

Merge branch 'alpine-meson-fix' into 'main'

Browse Source 
ci: Install correct version of Meson on Alpine CI image

See merge request GNOME/glib!3743
This commit is contained in:
Philip Withnall 2023-12-05 23:33:56 +00:00
commit 46ff86e027
2 changed files with 4 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" 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:v0" ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v1"
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

3
.gitlab-ci/alpine.Dockerfile
View File

@ -15,6 +15,7 @@ RUN apk add --no-cache \
libxslt \ libxslt \
meson \ meson \
musl-locales \ musl-locales \
py3-pip \
python3 \ python3 \
pcre2-dev \ pcre2-dev \
shared-mime-info \ 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 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