Skip to content

Commit 3d8d10d

Browse files
pks-tgitster
authored andcommitted
ci: use Debian instead of deprecated i386/ubuntu
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 <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a89027d commit 3d8d10d

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,8 @@ jobs:
395395
cc: gcc
396396
- jobname: linux-musl-meson
397397
image: alpine:latest
398-
# Supported until 2025-04-02.
399398
- jobname: linux32
400-
image: i386/ubuntu:focal
399+
image: i386/debian:latest
401400
# A RHEL 8 compatible distro. Supported until 2029-05-31.
402401
- jobname: almalinux-8
403402
image: almalinux:8

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ test:linux:
6666
- jobname: linux-musl-meson
6767
image: alpine:latest
6868
- jobname: linux32
69-
image: i386/ubuntu:20.04
69+
image: i386/debian:latest
7070
# A RHEL 8 compatible distro. Supported until 2029-05-31.
7171
- jobname: almalinux-8
7272
image: almalinux:8

ci/install-dependencies.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fedora-*|almalinux-*)
3939
dnf -yq update >/dev/null &&
4040
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
4141
;;
42-
ubuntu-*|i386/ubuntu-*|debian-*)
42+
ubuntu-*|i386/debian-*|debian-*)
4343
# Required so that apt doesn't wait for user input on certain packages.
4444
export DEBIAN_FRONTEND=noninteractive
4545

@@ -48,9 +48,9 @@ ubuntu-*|i386/ubuntu-*|debian-*)
4848
SVN='libsvn-perl subversion'
4949
LANGUAGES='language-pack-is'
5050
;;
51-
i386/ubuntu-*)
51+
i386/debian-*)
5252
SVN=
53-
LANGUAGES='language-pack-is'
53+
LANGUAGES='locales-all'
5454
;;
5555
*)
5656
SVN='libsvn-perl subversion'

ci/lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ then
250250
CI_OS_NAME=osx
251251
JOBS=$(nproc)
252252
;;
253-
*,almalinux:*|*,alpine:*|*,debian:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*)
253+
*,almalinux:*|*,alpine:*|*,debian:*|*,fedora:*|*,ubuntu:*|*,i386/debian:*)
254254
CI_OS_NAME=linux
255255
JOBS=$(nproc)
256256
;;

0 commit comments

Comments
 (0)