diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-12-10 08:01:06 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-12-10 08:01:06 +0300 |
commit | 0b32d1aea20d84561334d39861b27678ab529b69 (patch) | |
tree | 65c222e55a671803cc8f5b87b18776140b08a940 /ci | |
parent | 82444ead4ccb89afaba5c134d0df567e1500d942 (diff) | |
parent | d11192255d8ea477925bcdbdcab37cec7cec357d (diff) |
Merge branch 'ab/ci-use-macos-12'
CI fix.
* ab/ci-use-macos-12:
CI: upgrade to macos-12, and pin OSX version
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/install-dependencies.sh | 2 | ||||
-rwxr-xr-x | ci/lib.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d8fafc8ed2..4f407530d3 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -30,7 +30,7 @@ ubuntu-*) 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 @@ -252,7 +252,7 @@ ubuntu-*) 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)" |