From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 10 Dec 2022 07:17:47 +0000 (+0900)
Subject: Merge branch 'jx/ci-ubuntu-fix' into maint-2.38
X-Git-Tag: v2.38.2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e71f00f73f02196972042b119ea07f91b526956e;p=thirdparty%2Fgit.git

Merge branch 'jx/ci-ubuntu-fix' into maint-2.38

Adjust the GitHub CI to newer ubuntu release.

* jx/ci-ubuntu-fix:
  ci: install python on ubuntu
  ci: use the same version of p4 on both Linux and macOS
  ci: remove the pipe after "p4 -V" to catch errors
  github-actions: run gcc-8 on ubuntu-20.04 image
---

e71f00f73f02196972042b119ea07f91b526956e
diff --cc .github/workflows/main.yml
index 03d1b096a9,831a81f61d..51d99a56c0
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -232,15 -231,14 +231,14 @@@ jobs
            - jobname: linux-gcc
              cc: gcc
              cc_package: gcc-8
-             pool: ubuntu-latest
+             pool: ubuntu-20.04
            - jobname: linux-TEST-vars
              cc: gcc
-             os: ubuntu
              cc_package: gcc-8
-             pool: ubuntu-latest
+             pool: ubuntu-20.04
            - jobname: osx-clang
              cc: clang
 -            pool: macos-latest
 +            pool: macos-12
            - jobname: osx-gcc
              cc: gcc
              cc_package: gcc-9