diff options
| -rw-r--r-- | .github/workflows/main.yml | 4 | ||||
| -rwxr-xr-x | ci/install-dependencies.sh | 2 | ||||
| -rwxr-xr-x | ci/lib.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 286319d789..71bf71bbe9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d8fafc8ed2..4f407530d3 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -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 @@ -252,7 +252,7 @@ ubuntu-*) 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)" |