github: simplify computation of the job's distro
We explicitly list the distro of Linux-based jobs, but it is equivalent to the name of the image in almost all cases, except that colons are replaced with dashes. Drop the redundant information and massage it in our CI scripts, which is equivalent to how we do it in GitLab CI. There are a couple of exceptions: - The "linux32" job, whose distro name is different than the image name. This is handled by adapting all sites to use the new name. - The "alpine" and "fedora" jobs, neither of which specify a tag for their image. This is handled by adding the "latest" tag. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
9548e0478e
commit
b133d3071a
@ -33,7 +33,7 @@ fedora-*|almalinux-*)
|
||||
dnf -yq update >/dev/null &&
|
||||
dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
|
||||
;;
|
||||
ubuntu-*|ubuntu32-*|debian-*)
|
||||
ubuntu-*|i386/ubuntu-*|debian-*)
|
||||
# Required so that apt doesn't wait for user input on certain packages.
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
@ -42,7 +42,7 @@ ubuntu-*|ubuntu32-*|debian-*)
|
||||
SVN='libsvn-perl subversion'
|
||||
LANGUAGES='language-pack-is'
|
||||
;;
|
||||
ubuntu32-*)
|
||||
i386/ubuntu-*)
|
||||
SVN=
|
||||
LANGUAGES='language-pack-is'
|
||||
;;
|
||||
|
Reference in New Issue
Block a user