From 64d12a816f3cfd9bd8e6ed19eaaaea49e519af72 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 22 Sep 2025 16:04:48 +0200 Subject: [PATCH 1/2] To: git@vger.kernel.org --- b4-submit-tracking --- # This section is used internally by b4 prep for tracking purposes. { "series": { "revision": 1, "change-id": "20250922-pks-ci-update-linux32-job-855730628301", "prefixes": [] } } -- GitLab From 30b9476c14973b043bf1119c74262a80d6fc7cbb Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 22 Sep 2025 16:00:45 +0200 Subject: [PATCH 2/2] ci: stop using unsupported Ubuntu image in "linux32" job The "linux32" job is currently using the "i386/ubuntu" image. This image has not received any updates for more than two years by now as Ubuntu dropped support for the 32 bit architecture completely. Convert the job to use Debian instead. This distribution still supports 32 bit architectures and is as close as it gets to Ubuntu. 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 d122e79415a..d5baa661d5d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -393,9 +393,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 - jobname: pedantic image: fedora:latest # A RHEL 8 compatible distro. Supported until 2029-05-31. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf122e706f2..1ea526819ba 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 d061a472933..c96fda05459 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -33,7 +33,7 @@ fedora-*|almalinux-*) dnf -yq update >/dev/null && dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/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 @@ -42,9 +42,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) ;; -- GitLab