Skip to content

Commit 234037d

Browse files
committed
Merge branch 'js/ci-use-macos-13'
Replace macos-12 used at GitHub CI with macos-13. * js/ci-use-macos-13: ci: upgrade to using macos-13
2 parents 650963c + 682a868 commit 234037d

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ jobs:
276276
pool: ubuntu-20.04
277277
- jobname: osx-clang
278278
cc: clang
279-
pool: macos-12
279+
pool: macos-13
280280
- jobname: osx-gcc
281281
cc: gcc
282-
cc_package: gcc-9
283-
pool: macos-12
282+
cc_package: gcc-13
283+
pool: macos-13
284284
- jobname: linux-gcc-default
285285
cc: gcc
286286
pool: ubuntu-latest

ci/lib.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,9 @@ ubuntu-*)
253253
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
254254
;;
255255
macos-*)
256-
if [ "$jobname" = osx-gcc ]
256+
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
257+
if [ "$jobname" != osx-gcc ]
257258
then
258-
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
259-
else
260-
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
261259
MAKEFLAGS="$MAKEFLAGS APPLE_COMMON_CRYPTO_SHA1=Yes"
262260
fi
263261
;;

0 commit comments

Comments
 (0)