undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

github-actions: run gcc-8 on ubuntu-20.04 image

Browse Source 
GitHub starts to upgrade its runner image "ubuntu-latest" from version
"ubuntu-20.04" to version "ubuntu-22.04". It will fail to find and
install "gcc-8" package on the new runner image.

Change some of the runner images from "ubuntu-latest" to "ubuntu-20.04"
in order to install "gcc-8" as a dependency.

The first revision of this patch tried to replace "$runs_on_pool" in
"ci/*.sh" with a new "$runs_on_os" environment variable based on the
"os" field in the matrix strategy. But these "os" fields in matrix
strategies are obsolete legacies from commit [1] and commit [2], and
are no longer useful. So remove these unused "os" fields.

[1]: c08bb26010 (CI: rename the "Linux32" job to lower-case "linux32",
                 2021-11-23)
[2]: 25715419bf (CI: don't run "make test" twice in one job, 2021-11-23)

Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jiang Xin 2022-11-25 17:59:51 +08:00 committed by Junio C Hamano
parent e7e5c6f715
commit 0178420b9c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/main.yml vendored
View File

@ -227,17 +227,15 @@ jobs:
pool: ubuntu-latest pool: ubuntu-latest
- jobname: linux-sha256 - jobname: linux-sha256
cc: clang cc: clang
os: ubuntu
pool: ubuntu-latest pool: ubuntu-latest
- jobname: linux-gcc - jobname: linux-gcc
cc: gcc cc: gcc
cc_package: gcc-8 cc_package: gcc-8
pool: ubuntu-latest pool: ubuntu-20.04
- jobname: linux-TEST-vars - jobname: linux-TEST-vars
cc: gcc cc: gcc
os: ubuntu
cc_package: gcc-8 cc_package: gcc-8
pool: ubuntu-latest pool: ubuntu-20.04
- jobname: osx-clang - jobname: osx-clang
cc: clang cc: clang
pool: macos-latest pool: macos-latest
@ -282,7 +280,6 @@ jobs:
- jobname: linux-musl - jobname: linux-musl
image: alpine image: alpine
- jobname: linux32 - jobname: linux32
os: ubuntu32
image: daald/ubuntu32:xenial image: daald/ubuntu32:xenial
- jobname: pedantic - jobname: pedantic
image: fedora image: fedora

2
ci/install-dependencies.sh
View File

@ -12,7 +12,7 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl" libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
case "$runs_on_pool" in case "$runs_on_pool" in
ubuntu-latest) ubuntu-*)
sudo apt-get -q update sudo apt-get -q update
sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
$UBUNTU_COMMON_PKGS $CC_PACKAGE $UBUNTU_COMMON_PKGS $CC_PACKAGE

2
ci/lib.sh
View File

@ -226,7 +226,7 @@ export GIT_TEST_CLONE_2GB=true
export SKIP_DASHED_BUILT_INS=YesPlease export SKIP_DASHED_BUILT_INS=YesPlease
case "$runs_on_pool" in case "$runs_on_pool" in
ubuntu-latest) ubuntu-*)
if test "$jobname" = "linux-gcc-default" if test "$jobname" = "linux-gcc-default"
then then
break break