Merge branch 'ab/ci-use-macos-12'
CI fix. * ab/ci-use-macos-12: CI: upgrade to macos-12, and pin OSX version
This commit is contained in:
commit
0b32d1aea2
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@ -238,11 +238,11 @@ jobs:
|
||||
pool: ubuntu-20.04
|
||||
- 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
|
||||
|
@ -30,7 +30,7 @@ ubuntu-*)
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user