diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-10 16:17:47 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-10 16:17:47 +0900 |
| commit | e71f00f73f02196972042b119ea07f91b526956e (patch) | |
| tree | aabffeedbabcc0b87ab1b0b9946efac52a6cde1c /.github/workflows | |
| parent | ec9816c6b3d10c7a975511fad5ff4b8a2991b233 (diff) | |
| parent | 0d3507f3e7b74ccbaa6f1ddc282cf467cce0e102 (diff) | |
| download | git-e71f00f73f02196972042b119ea07f91b526956e.tar.gz | |
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
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/main.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03d1b096a9..51d99a56c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -227,17 +227,15 @@ jobs: pool: ubuntu-latest - jobname: linux-sha256 cc: clang - os: ubuntu pool: ubuntu-latest - 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-12 @@ -280,7 +278,6 @@ jobs: - jobname: linux-musl image: alpine - jobname: linux32 - os: ubuntu32 image: daald/ubuntu32:xenial - jobname: pedantic image: fedora |