Skip to content

Commit 0b32d1a

Browse files
committed
Merge branch 'ab/ci-use-macos-12'
CI fix. * ab/ci-use-macos-12: CI: upgrade to macos-12, and pin OSX version
2 parents 82444ea + d111922 commit 0b32d1a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,11 @@ jobs:
238238
pool: ubuntu-20.04
239239
- jobname: osx-clang
240240
cc: clang
241-
pool: macos-latest
241+
pool: macos-12
242242
- jobname: osx-gcc
243243
cc: gcc
244244
cc_package: gcc-9
245-
pool: macos-latest
245+
pool: macos-12
246246
- jobname: linux-gcc-default
247247
cc: gcc
248248
pool: ubuntu-latest

ci/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ubuntu-*)
3030
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
3131
popd
3232
;;
33-
macos-latest)
33+
macos-*)
3434
export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
3535
# Uncomment this if you want to run perf tests:
3636
# brew install gnu-time

ci/lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ ubuntu-*)
252252
GIT_LFS_PATH="$HOME/custom/git-lfs"
253253
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
254254
;;
255-
macos-latest)
255+
macos-*)
256256
if [ "$jobname" = osx-gcc ]
257257
then
258258
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"

0 commit comments

Comments
 (0)