Skip to content

Commit

Permalink
Merge branch 'bc/ancient-ci' into jch
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ttaylorr committed Nov 1, 2024
2 parents 5212635 + ac112fd commit 515fd3a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,21 @@ jobs:
- jobname: linux-musl
image: alpine
distro: alpine-latest
# Supported until 2025-04-02.
- jobname: linux32
image: i386/ubuntu:focal
distro: ubuntu32-20.04
- jobname: pedantic
image: fedora
distro: fedora-latest
# A RHEL 8 compatible distro. Supported until 2029-05-31.
- jobname: almalinux-8
image: almalinux:8
distro: almalinux-8
# Supported until 2026-08-31.
- jobname: debian-11
image: debian:11
distro: debian-11
env:
jobname: ${{matrix.vector.jobname}}
distro: ${{matrix.vector.distro}}
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test:linux:
parallel:
matrix:
- jobname: linux-old
image: ubuntu:16.04
image: ubuntu:20.04
CC: gcc
- jobname: linux-sha256
image: ubuntu:latest
Expand Down
19 changes: 10 additions & 9 deletions ci/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,37 +29,38 @@ alpine-*)
apache2 apache2-http2 apache2-proxy apache2-ssl apache2-webdav apr-util-dbd_sqlite3 \
bash cvs gnupg perl-cgi perl-dbd-sqlite perl-io-tty >/dev/null
;;
fedora-*)
fedora-*|almalinux-*)
dnf -yq update >/dev/null &&
dnf -yq install make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
;;
ubuntu-*|ubuntu32-*)
ubuntu-*|ubuntu32-*|debian-*)
# Required so that apt doesn't wait for user input on certain packages.
export DEBIAN_FRONTEND=noninteractive

case "$distro" in
ubuntu-*)
SVN='libsvn-perl subversion'
LANGUAGES='language-pack-is'
;;
*)
ubuntu32-*)
SVN=
LANGUAGES='language-pack-is'
;;
*)
SVN='libsvn-perl subversion'
LANGUAGES='locales-all'
;;
esac

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

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

Expand Down

0 comments on commit 515fd3a

Please sign in to comment.