diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-12-06 22:57:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-12-07 07:36:22 +0300 |
commit | d11192255d8ea477925bcdbdcab37cec7cec357d (patch) | |
tree | 680614e7cbdc1ca6749d45f46d0d5af0cc6e4739 /ci | |
parent | e7e5c6f715b2de7bea0d39c7d2ba887335b40aa0 (diff) |
CI: upgrade to macos-12, and pin OSX version
Per [1] and the warnings our CI is emitting GitHub is phasing in
"macos-12" as their "macos-latest".
As with [2], let's pin our image to a specific version so that we're
not having it swept from under us, and our upgrade cycle can be more
predictable than whenever GitHub changes their images.
1. https://github.com/actions/runner-images/issues/6384
2. 0178420b9ca (github-actions: run gcc-8 on ubuntu-20.04 image,
2022-11-25)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 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)" |