diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-11-29 04:41:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-29 04:41:06 +0300 |
| commit | 515ffabccf75c221cbb6bcef7eb8f89f6c832da9 (patch) | |
| tree | b4fe6e44e03325d025cbb22b415789d58fb1c7c8 /.github | |
| parent | 8165c6af118b0b484dedf7df1be19645461db923 (diff) | |
| parent | 0d3507f3e7b74ccbaa6f1ddc282cf467cce0e102 (diff) | |
Merge branch 'jx/ci-ubuntu-fix'
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')
| -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 592f9193a8..9afacfa0b3 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-latest @@ -288,7 +286,6 @@ jobs: - jobname: linux-musl image: alpine - jobname: linux32 - os: ubuntu32 image: daald/ubuntu32:xenial - jobname: pedantic image: fedora |