diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-12-10 08:02:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-12-10 08:02:09 +0300 |
commit | 75efbc1372e27155a2607fd0e8e559e0a020a842 (patch) | |
tree | fe780c02bbfef773b32c46551c73a1c9a88f86d6 | |
parent | 634d02686677ba5153837709e4133998bc80dd2c (diff) | |
parent | d11192255d8ea477925bcdbdcab37cec7cec357d (diff) |
Merge branch 'ab/ci-use-macos-12' into maint-2.38
CI fix.
* ab/ci-use-macos-12:
CI: upgrade to macos-12, and pin OSX version
-rw-r--r-- | .github/workflows/main.yml | 4 | ||||
-rwxr-xr-x | ci/install-dependencies.sh | 2 | ||||
-rwxr-xr-x | ci/lib.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b6d0cf24ff..d5587e6b1b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -240,11 +240,11 @@ jobs: pool: ubuntu-latest - jobname: osx-clang cc: clang - pool: macos-latest + pool: macos-12 - jobname: osx-gcc cc: gcc cc_package: gcc-9 - pool: macos-latest + pool: macos-12 - jobname: linux-gcc-default cc: gcc pool: ubuntu-latest diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 107757a1fe..c3a92b307d 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -30,7 +30,7 @@ ubuntu-latest) cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs . popd ;; -macos-latest) +macos-*) export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 # Uncomment this if you want to run perf tests: # brew install gnu-time @@ -253,7 +253,7 @@ ubuntu-latest) GIT_LFS_PATH="$HOME/custom/git-lfs" export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" ;; -macos-latest) +macos-*) if [ "$jobname" = osx-gcc ] then MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" |