Skip to content

Commit 8afff26

Browse files
committed
Merge branch 'bc/ancient-ci'
Drop support for ancient environments in various CI jobs. * bc/ancient-ci: Add additional CI jobs to avoid accidental breakage ci: remove clause for Ubuntu 16.04 gitlab-ci: switch from Ubuntu 16.04 to 20.04
2 parents e66fd72 + ac112fd commit 8afff26

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,21 @@ jobs:
342342
- jobname: linux-musl
343343
image: alpine
344344
distro: alpine-latest
345+
# Supported until 2025-04-02.
345346
- jobname: linux32
346347
image: i386/ubuntu:focal
347348
distro: ubuntu32-20.04
348349
- jobname: pedantic
349350
image: fedora
350351
distro: fedora-latest
352+
# A RHEL 8 compatible distro. Supported until 2029-05-31.
353+
- jobname: almalinux-8
354+
image: almalinux:8
355+
distro: almalinux-8
356+
# Supported until 2026-08-31.
357+
- jobname: debian-11
358+
image: debian:11
359+
distro: debian-11
351360
env:
352361
jobname: ${{matrix.vector.jobname}}
353362
distro: ${{matrix.vector.distro}}

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ test:linux:
3535
parallel:
3636
matrix:
3737
- jobname: linux-old
38-
image: ubuntu:16.04
38+
image: ubuntu:20.04
3939
CC: gcc
4040
- jobname: linux-sha256
4141
image: ubuntu:latest

ci/install-dependencies.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,37 +29,38 @@ alpine-*)
2929
apache2 apache2-http2 apache2-proxy apache2-ssl apache2-webdav apr-util-dbd_sqlite3 \
3030
bash cvs gnupg perl-cgi perl-dbd-sqlite perl-io-tty >/dev/null
3131
;;
32-
fedora-*)
32+
fedora-*|almalinux-*)
3333
dnf -yq update >/dev/null &&
3434
dnf -yq install make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
3535
;;
36-
ubuntu-*|ubuntu32-*)
36+
ubuntu-*|ubuntu32-*|debian-*)
3737
# Required so that apt doesn't wait for user input on certain packages.
3838
export DEBIAN_FRONTEND=noninteractive
3939

4040
case "$distro" in
4141
ubuntu-*)
4242
SVN='libsvn-perl subversion'
43+
LANGUAGES='language-pack-is'
4344
;;
44-
*)
45+
ubuntu32-*)
4546
SVN=
47+
LANGUAGES='language-pack-is'
48+
;;
49+
*)
50+
SVN='libsvn-perl subversion'
51+
LANGUAGES='locales-all'
4652
;;
4753
esac
4854

4955
sudo apt-get -q update
5056
sudo apt-get -q -y install \
51-
language-pack-is apache2 cvs cvsps git gnupg $SVN \
57+
$LANGUAGES apache2 cvs cvsps git gnupg $SVN \
5258
make libssl-dev libcurl4-openssl-dev libexpat-dev wget sudo default-jre \
5359
tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
5460
libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \
5561
${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE
5662

5763
case "$distro" in
58-
ubuntu-16.04)
59-
# Does not support JGit, but we also don't really care about
60-
# the others. We rather care whether Git still compiles and
61-
# runs fine overall.
62-
;;
6364
ubuntu-*)
6465
mkdir --parents "$CUSTOM_PATH"
6566

0 commit comments

Comments
 (0)