Skip to content

Commit 0178420

Browse files
jiangxingitster
authored andcommitted
github-actions: run gcc-8 on ubuntu-20.04 image
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]: c08bb26 (CI: rename the "Linux32" job to lower-case "linux32", 2021-11-23) [2]: 2571541 (CI: don't run "make test" twice in one job, 2021-11-23) Reviewed-by: Johannes Schindelin <[email protected]> Helped-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Jiang Xin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e7e5c6f commit 0178420

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,15 @@ jobs:
227227
pool: ubuntu-latest
228228
- jobname: linux-sha256
229229
cc: clang
230-
os: ubuntu
231230
pool: ubuntu-latest
232231
- jobname: linux-gcc
233232
cc: gcc
234233
cc_package: gcc-8
235-
pool: ubuntu-latest
234+
pool: ubuntu-20.04
236235
- jobname: linux-TEST-vars
237236
cc: gcc
238-
os: ubuntu
239237
cc_package: gcc-8
240-
pool: ubuntu-latest
238+
pool: ubuntu-20.04
241239
- jobname: osx-clang
242240
cc: clang
243241
pool: macos-latest
@@ -282,7 +280,6 @@ jobs:
282280
- jobname: linux-musl
283281
image: alpine
284282
- jobname: linux32
285-
os: ubuntu32
286283
image: daald/ubuntu32:xenial
287284
- jobname: pedantic
288285
image: fedora

ci/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
1212
libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
1313

1414
case "$runs_on_pool" in
15-
ubuntu-latest)
15+
ubuntu-*)
1616
sudo apt-get -q update
1717
sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
1818
$UBUNTU_COMMON_PKGS $CC_PACKAGE

ci/lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ export GIT_TEST_CLONE_2GB=true
226226
export SKIP_DASHED_BUILT_INS=YesPlease
227227

228228
case "$runs_on_pool" in
229-
ubuntu-latest)
229+
ubuntu-*)
230230
if test "$jobname" = "linux-gcc-default"
231231
then
232232
break

0 commit comments

Comments
 (0)