From: Patrick Steinhardt Date: Thu, 23 Oct 2025 07:17:38 GMT Subject: [PATCH 1/3] ci: use Debian instead of deprecated i386/ubuntu Message-ID: <20251023-b4-pks-rust-cbindgen-v1-1-c19b61b03127@pks.im> In-Reply-To: <20251023-b4-pks-rust-cbindgen-v1-0-c19b61b03127@pks.im> Ubuntu has ended support for 32 bit platforms and is not maintaining any release anymore that has 32 bit support. But we still use i386/ubuntu in our CI pipeline to test for compatibility with 32 bit systems, even though that specific image does not receive updates anymore. Besides being end-of-life, this image also doesn't have all packages available to it anymore. This creates problems with a subsequent patch, where we're about to pull in cbindgen for generating Rust to C bindings. Drop the Ubuntu image and use Debian instead, which continues to maintain its 32 bit port. Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 3 +-- .gitlab-ci.yml | 2 +- ci/install-dependencies.sh | 6 +++--- ci/lib.sh | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc54824c388..0b16970cd7e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -395,9 +395,8 @@ jobs: cc: gcc - jobname: linux-musl-meson image: alpine:latest - # Supported until 2025-04-02. - jobname: linux32 - image: i386/ubuntu:focal + 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 b419a84e2cc..85feebf72d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ test:linux: - jobname: linux-musl-meson image: alpine:latest - jobname: linux32 - image: i386/ubuntu:20.04 + image: i386/debian:latest - jobname: linux-meson image: ubuntu:rolling CC: gcc diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 50628ee2dd6..b7b3cf35edf 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,9 +48,9 @@ ubuntu-*|i386/ubuntu-*|debian-*) SVN='libsvn-perl subversion' LANGUAGES='language-pack-is' ;; - i386/ubuntu-*) + i386/debian-*) SVN= - LANGUAGES='language-pack-is' + LANGUAGES='locales-all' ;; *) SVN='libsvn-perl subversion' diff --git a/ci/lib.sh b/ci/lib.sh index f561884d401..865a0675371 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -250,7 +250,7 @@ then CI_OS_NAME=osx JOBS=$(nproc) ;; - *,alpine:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*) + *,alpine:*|*,fedora:*|*,ubuntu:*|*,i386/debian:*) CI_OS_NAME=linux JOBS=$(nproc) ;; -- 2.51.1.930.gacf6e81ea2.dirty