]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jx/ci-ubuntu-fix' into maint-2.38
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Dec 2022 07:17:47 +0000 (16:17 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Dec 2022 07:17:47 +0000 (16:17 +0900)
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

1  2 
.github/workflows/main.yml
ci/install-dependencies.sh
ci/lib.sh

index 03d1b096a9a5ab4a2ae10edf86d98123ce95d65f,831a81f61d1fdccc6d41ebf7f4b6d41c53f15a9d..51d99a56c031cdfcc4899b93ee4927ea1dcaabb8
@@@ -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
Simple merge
diff --cc ci/lib.sh
Simple merge