diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-04-10 19:25:02 +0200 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-04-16 23:59:03 +0200 |
| commit | b12dcab61d0eaaffab6e5bb97667407a523c4b1f (patch) | |
| tree | b95af5ccb5c8b620e3f38daf6c2c7f3db170d08f /ci | |
| parent | c7db432de6cf7f53888405c24609793cd550da97 (diff) | |
| parent | 3167b60e5bd9fb8e2f9413b38001b624dc2e3da2 (diff) | |
| download | git-b12dcab61d0eaaffab6e5bb97667407a523c4b1f.tar.xz | |
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
This is another backport to `maint-2.39` to allow less CI jobs to break.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/lib.sh | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -253,11 +253,9 @@ ubuntu-*) export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" ;; macos-*) - if [ "$jobname" = osx-gcc ] + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" + if [ "$jobname" != osx-gcc ] then - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" - else - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)" MAKEFLAGS="$MAKEFLAGS NO_APPLE_COMMON_CRYPTO=NoThanks" MAKEFLAGS="$MAKEFLAGS NO_OPENSSL=NoThanks" fi |
