undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/ci-use-macos-12'

Browse Source 
CI fix.

* ab/ci-use-macos-12:
  CI: upgrade to macos-12, and pin OSX version
This commit is contained in:
Junio C Hamano 2022-12-10 14:01:06 +09:00
commit 0b32d1aea2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@ -238,11 +238,11 @@ jobs:
pool: ubuntu-20.04 pool: ubuntu-20.04
- jobname: osx-clang - jobname: osx-clang
cc: clang cc: clang
pool: macos-latest pool: macos-12
- jobname: osx-gcc - jobname: osx-gcc
cc: gcc cc: gcc
cc_package: gcc-9 cc_package: gcc-9
pool: macos-latest pool: macos-12
- jobname: linux-gcc-default - jobname: linux-gcc-default
cc: gcc cc: gcc
pool: ubuntu-latest pool: ubuntu-latest

2
ci/install-dependencies.sh
View File

@ -30,7 +30,7 @@ ubuntu-*)
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs . cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
popd popd
;; ;;
macos-latest) macos-*)
export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
# Uncomment this if you want to run perf tests: # Uncomment this if you want to run perf tests:
# brew install gnu-time # brew install gnu-time

2
ci/lib.sh
View File

@ -252,7 +252,7 @@ ubuntu-*)
GIT_LFS_PATH="$HOME/custom/git-lfs" GIT_LFS_PATH="$HOME/custom/git-lfs"
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
;; ;;
macos-latest) macos-*)
if [ "$jobname" = osx-gcc ] if [ "$jobname" = osx-gcc ]
then then
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"