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>

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 831f4df56c51dc96b17465a5120d28bf11a63351..3413a2a1d4b50857198389eb3ae9bab36d6841f7 100644 (file)
--- 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 107757a1fea4c2839de8ebe871b648e91c5b97a6..c3a92b307d38cbcb71f06b5d8c5d8c1e0942384d 100755 (executable)
--- 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

diff --git a/ci/lib.sh b/ci/lib.sh
index 1b0cc2b57db8667f3cbc9ae8b6223dd7997e7485..03d7de01338cfef1d151ee1e74316c8fe14f45f1 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -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)"