Browse Source

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. 0178420b9c (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>
maint
Ævar Arnfjörð Bjarmason 2 years ago committed by Junio C Hamano
parent
commit
d11192255d
  1. 4
      .github/workflows/main.yml
  2. 2
      ci/install-dependencies.sh
  3. 2
      ci/lib.sh

4
.github/workflows/main.yml

@ -240,11 +240,11 @@ jobs: @@ -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

2
ci/install-dependencies.sh

@ -30,7 +30,7 @@ ubuntu-latest) @@ -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

2
ci/lib.sh

@ -253,7 +253,7 @@ ubuntu-latest) @@ -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)"

Loading…
Cancel
Save