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

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

Browse Source 
The Debian 12.8 point release included a version of ninja that is
equivalent to the one we were building from source here.

This reverts commit dbd7280c5e.

Signed-off-by: Simon McVittie <smcv@debian.org>
This commit is contained in:
Simon McVittie 2024-11-19 09:40:51 +00:00
parent 3dffcd2569
commit 55a1d3af0d
2 changed files with 1 additions and 19 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"
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v23"
DEBIAN_I386_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable-i386:v2"
DEBIAN_I386_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable-i386:v3"
ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v7"
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.5"
GOBJECT_INTROSPECTION_TAG: "1.80.1"

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

@ -74,24 +74,6 @@ ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
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
ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user