From: Patrick Steinhardt Date: Thu, 08 Oct 2026 10:01:22 GMT Subject: [PATCH 4/8] ci: switch away from unsupported i386/ubuntu image Message-ID: <20261008-pks-ci-housekeeping-v1-4-baf015c589c0@pks.im> In-Reply-To: <20261008-pks-ci-housekeeping-v1-0-baf015c589c0@pks.im> The linux32 job is used to exercise Git on a 32 bit platform. That job uses i386/ubuntu:20.04 though, and that version of Ubuntu is end of life nowadays. Furthermore, Ubuntu has dropped support for 32 bit entirely with the 20.04 release, so we cannot easily upgrade it to a more recent image anymore. Switch the job over to use i386/debian instead. Note that starting with Debian 13, support for i386 has been reduced [1]. But Debian still releases 32 bit Docker images for the latest release nowadays, so we will have coverage until at least 2030. [1]: https://www.debian.org/releases/trixie/release-notes/issues.en.html#i386-reduced-support Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 3 +-- .gitlab-ci.yml | 3 +-- ci/install-dependencies.sh | 6 +----- ci/lib.sh | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b229739be8..6d1e37c8f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -431,9 +431,8 @@ jobs: cc: gcc - jobname: linux-musl-meson image: alpine:latest - # Supported until 2025-04-02. - jobname: linux32 - image: i386/ubuntu:20.04 + image: i386/debian:latest # A RHEL 8 compatible distro. Supported until 2029-05-31. - jobname: almalinux-8 image: almalinux:8 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f24835500..7d972f0c8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,9 +65,8 @@ test:linux: CC: gcc - jobname: linux-musl-meson image: alpine:latest - # Supported until 2025-04-02. - jobname: linux32 - image: i386/ubuntu:20.04 + image: i386/debian:latest # A RHEL 8 compatible distro. Supported until 2029-05-31. - jobname: almalinux-8 image: almalinux:8 diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d57dce5663..8783b48951 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -39,7 +39,7 @@ fedora-*|almalinux-*) dnf -yq update >/dev/null && dnf -yq install shadow-utils sudo make pkg-config gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel $MESON_DEPS cargo >/dev/null ;; -ubuntu-*|i386/ubuntu-*|debian-*) +ubuntu-*|i386/debian-*|debian-*) # Required so that apt doesn't wait for user input on certain packages. export DEBIAN_FRONTEND=noninteractive @@ -48,10 +48,6 @@ ubuntu-*|i386/ubuntu-*|debian-*) SVN='libsvn-perl subversion' LANGUAGES='language-pack-is' ;; - i386/ubuntu-*) - SVN= - LANGUAGES='language-pack-is' - ;; *) SVN='libsvn-perl subversion' LANGUAGES='locales-all' diff --git a/ci/lib.sh b/ci/lib.sh index c6ccbf8c17..d99e7b9da1 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -262,7 +262,7 @@ then CI_OS_NAME=osx JOBS=$(nproc) ;; - *,almalinux:*|*,alpine:*|*,debian:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*) + *,almalinux:*|*,alpine:*|*,debian:*|*,fedora:*|*,ubuntu:*|*,i386/debian:*) CI_OS_NAME=linux JOBS=$(nproc) ;; -- 2.56.0.406.ga2d225a756.dirty