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>
Ævar Arnfjörð Bjarmason committed
Dec 6, 2022 at 20:57 UTC
d11192255d8ea477925bcdbdcab37cec7cec357d
3 files changed
+4
-4
.github/workflows/main.yml
+2
-2
@@ -240,11 +240,11 @@ jobs:
240
pool: ubuntu-latest
241
- jobname: osx-clang
242
cc: clang
243
- pool: macos-latest
243
+ pool: macos-12
244
- jobname: osx-gcc
245
cc: gcc
246
cc_package: gcc-9
247
- pool: macos-latest
247
+ pool: macos-12
248
- jobname: linux-gcc-default
249
cc: gcc
250
pool: ubuntu-latest
ci/install-dependencies.sh
+1
-1
@@ -30,7 +30,7 @@ ubuntu-latest)
30
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
31
popd
32
;;
33
-macos-latest)
33
+macos-*)
34
export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
35
# Uncomment this if you want to run perf tests:
36
# brew install gnu-time
ci/lib.sh
+1
-1
@@ -253,7 +253,7 @@ ubuntu-latest)
253
GIT_LFS_PATH="$HOME/custom/git-lfs"
254
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
255
;;
256
-macos-latest)
256
+macos-*)
257
if [ "$jobname" = osx-gcc ]
258
then
259
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"