mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/ci-use-macos-13'

Browse Source 
Replace macos-12 used at GitHub CI with macos-13.

* js/ci-use-macos-13:
  ci: upgrade to using macos-13
This commit is contained in:
Junio C Hamano
2023-11-08 11:03:59 +09:00
parent 650963cfd0 682a868f67
commit 234037dbec
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
ci/lib.sh
View File

@ -253,11 +253,9 @@ ubuntu-*)
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
;; ;;
macos-*) macos-*)
if [ "$jobname" = osx-gcc ]
then
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
else if [ "$jobname" != osx-gcc ]
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)" then
MAKEFLAGS="$MAKEFLAGS APPLE_COMMON_CRYPTO_SHA1=Yes" MAKEFLAGS="$MAKEFLAGS APPLE_COMMON_CRYPTO_SHA1=Yes"
fi fi
;; ;;