Skip to content

Commit 75efbc1

Browse files
committed
Merge branch 'ab/ci-use-macos-12' into maint-2.38
CI fix. * ab/ci-use-macos-12: CI: upgrade to macos-12, and pin OSX version
2 parents 634d026 + d111922 commit 75efbc1

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
@@ -240,11 +240,11 @@ jobs:
240240
pool: ubuntu-latest
241241
- jobname: osx-clang
242242
cc: clang
243-
pool: macos-latest
243+
pool: macos-12
244244
- jobname: osx-gcc
245245
cc: gcc
246246
cc_package: gcc-9
247-
pool: macos-latest
247+
pool: macos-12
248248
- jobname: linux-gcc-default
249249
cc: gcc
250250
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-latest)
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
@@ -253,7 +253,7 @@ ubuntu-latest)
253253
GIT_LFS_PATH="$HOME/custom/git-lfs"
254254
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
255255
;;
256-
macos-latest)
256+
macos-*)
257257
if [ "$jobname" = osx-gcc ]
258258
then
259259
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"

0 commit comments

Comments
 (0)