luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

CI: Rebuild a slightly newer version of ninja for debian-stable-i386

Browse Source 
The version of ninja-build in Debian 12 isn't built with large file
support, and therefore is not compatible with filesystems with large
inode numbers. Unfortunately, that includes the overlay mounts used by
Docker.

I've suggested a stable update for this as part of the next Debian 12
point release. Until/unless that happens, we can build our own.

Signed-off-by: Simon McVittie <smcv@debian.org>
This commit is contained in:
Simon McVittie 2024-10-19 17:45:51 +01:00
parent 20d54ba5f1
commit dbd7280c5e
2 changed files with 19 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:v39.5" FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.5"
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:v23" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v23"
DEBIAN_I386_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable-i386:v1" DEBIAN_I386_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable-i386:v2"
ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v7" ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v7"
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.5" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.5"
GOBJECT_INTROSPECTION_TAG: "1.80.1" GOBJECT_INTROSPECTION_TAG: "1.80.1"

18
.gitlab-ci/debian-stable.Dockerfile
View File

@ -74,6 +74,24 @@ ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
RUN pip3 install --break-system-packages meson==1.4.2 RUN pip3 install --break-system-packages meson==1.4.2
# ninja-build 1.11.1 didn't build with large file support on 32-bit,
# breaking the i386 image when used with overlayfs.
# The fix from upstream 1.12.0 was backported to Debian in 1.11.1-2,
# but too late for Debian 12. https://bugs.debian.org/1041897
RUN if [ "$(dpkg --print-architecture)" = i386 ]; then \
apt-get install --no-install-recommends -qq -y \
debhelper \
re2c \
&& mkdir /run/build \
&& git clone --depth=1 -b debian/1.11.1-2 https://salsa.debian.org/debian/ninja-build.git /run/build/ninja-build \
&& cd /run/build/ninja-build \
&& git checkout e39b5f01229311916302300449d951735e4a3e3f \
&& dpkg-buildpackage -B -Pnodoc \
&& dpkg -i ../*.deb \
&& cd / \
&& rm -fr /run/build; \
fi
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 useradd -u $HOST_USER_ID -ms /bin/bash user RUN useradd -u $HOST_USER_ID -ms /bin/bash user