From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 10 Dec 2022 05:01:06 +0000 (+0900)
Subject: Merge branch 'ab/ci-use-macos-12'
X-Git-Tag: v2.39.0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b32d1aea20d84561334d39861b27678ab529b69;p=thirdparty%2Fgit.git

Merge branch 'ab/ci-use-macos-12'

CI fix.

* ab/ci-use-macos-12:
  CI: upgrade to macos-12, and pin OSX version
---

0b32d1aea20d84561334d39861b27678ab529b69
diff --cc .github/workflows/main.yml
index 286319d789,3413a2a1d4..71bf71bbe9
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -231,14 -232,15 +231,14 @@@ jobs
            - jobname: linux-gcc
              cc: gcc
              cc_package: gcc-8
 -            pool: ubuntu-latest
 +            pool: ubuntu-20.04
            - jobname: linux-TEST-vars
              cc: gcc
 -            os: ubuntu
              cc_package: gcc-8
 -            pool: ubuntu-latest
 +            pool: ubuntu-20.04
            - jobname: osx-clang
              cc: clang
-             pool: macos-latest
+             pool: macos-12
            - jobname: osx-gcc
              cc: gcc
              cc_package: gcc-9