diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:03:59 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:03:59 +0900 |
commit | 234037dbec13b5c94c014b9c46042252dff8bef7 (patch) | |
tree | 5c110e20e5cfc47225a1f6e65a65834bd949c2c7 | |
parent | 650963cfd060f72e95abf8cec18a3cee9c2a3e1a (diff) | |
parent | 682a868f674bb0e12740c9b642097762b3b692e1 (diff) | |
download | git-234037dbec13b5c94c014b9c46042252dff8bef7.tar.gz |
Merge branch 'js/ci-use-macos-13'
Replace macos-12 used at GitHub CI with macos-13.
* js/ci-use-macos-13:
ci: upgrade to using macos-13
-rw-r--r-- | .github/workflows/main.yml | 6 | ||||
-rwxr-xr-x | ci/lib.sh | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dcf7d78f1d..9fdbd54028 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -276,11 +276,11 @@ jobs: pool: ubuntu-20.04 - jobname: osx-clang cc: clang - pool: macos-12 + pool: macos-13 - jobname: osx-gcc cc: gcc - cc_package: gcc-9 - pool: macos-12 + cc_package: gcc-13 + pool: macos-13 - jobname: linux-gcc-default cc: gcc pool: ubuntu-latest @@ -253,11 +253,9 @@ ubuntu-*) export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" ;; macos-*) - if [ "$jobname" = osx-gcc ] + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" + if [ "$jobname" != osx-gcc ] then - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" - else - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)" MAKEFLAGS="$MAKEFLAGS APPLE_COMMON_CRYPTO_SHA1=Yes" fi ;; |