Skip to content

Commit 9ce2e99

Browse files
peffgitster
authored andcommitted
ci: use more recent linux32 image
The Xenial image we're using was released more than 8 years ago. This is a problem for using some recent GitHub Actions scripts, as they require Node.js 20, and all of the binaries they ship need glibc 2.28 or later. We're not using them yet, but moving forward prepares us for a future patch which will. Xenial was actually the last official 32-bit Ubuntu release, but you can still find i386 images for more recent releases. This patch uses Focal, which was released in 2020 (and is the oldest one with glibc 2.28). There are two small downsides here: - while Xenial is pretty old, it is still in LTS support until April 2026. So there's probably some value in testing with such an old system, and we're losing that. - there are no i386 subversion packages in the Focal repository. So we won't be able to test that (OTOH, we had never tested it until the previous patch which unified the 32/64-bit dependency code). Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e24a7bc commit 9ce2e99

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ jobs:
339339
image: alpine
340340
distro: alpine-latest
341341
- jobname: linux32
342-
image: daald/ubuntu32:xenial
343-
distro: ubuntu32-16.04
342+
image: i386/ubuntu:focal
343+
distro: ubuntu32-20.04
344344
- jobname: pedantic
345345
image: fedora
346346
distro: fedora-latest

ci/install-dependencies.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,18 @@ ubuntu-*|ubuntu32-*)
3737
# Required so that apt doesn't wait for user input on certain packages.
3838
export DEBIAN_FRONTEND=noninteractive
3939

40+
case "$distro" in
41+
ubuntu-*)
42+
SVN='libsvn-perl subversion'
43+
;;
44+
*)
45+
SVN=
46+
;;
47+
esac
48+
4049
sudo apt-get -q update
4150
sudo apt-get -q -y install \
42-
language-pack-is libsvn-perl apache2 cvs cvsps git gnupg subversion \
51+
language-pack-is apache2 cvs cvsps git gnupg $SVN \
4352
make libssl-dev libcurl4-openssl-dev libexpat-dev wget sudo default-jre \
4453
tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
4554
libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \

0 commit comments

Comments
 (0)