Skip to content

Commit 7bbce2a

Browse files
biojppmbiojppm
committed
ci: macos-13 was deprecated
1 parent 1313e3e commit 7bbce2a

File tree

8 files changed

+59
-93
lines changed

8 files changed

+59
-93
lines changed

‎.github/workflows-in/api.ys‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ python-preamble-job =::
77
matrix:
88
config:
99
- {pythonv: '3.13', os: ubuntu-latest}
10-
- {pythonv: '3.13', os: macos-13}
10+
- {pythonv: '3.13', os: macos-15-intel}
1111
python-preamble-job-win =::
1212
runs-on: ${{matrix.config.os}}
1313
strategy:

‎.github/workflows-in/install.ys‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@ jobs:
2525
matrix:
2626
include:
2727

28-
- {name: find_package/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
29-
- {name: find_package/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
30-
- {name: find_package/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON, commonvars: -DRYML_USE_LIBCXX=ON}
31-
- {name: find_package/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON, commonvars: -DRYML_USE_LIBCXX=ON}
32-
- {name: find_package/macos, sdir: test/test_install, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
33-
- {name: find_package/macos, sdir: test/test_install, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
34-
- {name: find_package/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
35-
- {name: find_package/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
28+
- {name: find_package/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
29+
- {name: find_package/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
30+
- {name: find_package/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON, commonvars: -DRYML_USE_LIBCXX=ON}
31+
- {name: find_package/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON, commonvars: -DRYML_USE_LIBCXX=ON}
32+
- {name: find_package/macos, sdir: test/test_install, os: macos-15-intel, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
33+
- {name: find_package/macos, sdir: test/test_install, os: macos-15-intel, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
34+
- {name: find_package/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
35+
- {name: find_package/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
3636

37-
- {name: find_library/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
38-
- {name: find_library/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
39-
- {name: find_library/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF, commonvars: -DRYML_USE_LIBCXX=ON}
40-
- {name: find_library/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF, commonvars: -DRYML_USE_LIBCXX=ON}
41-
- {name: find_library/macos, sdir: test/test_install, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
42-
- {name: find_library/macos, sdir: test/test_install, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
43-
- {name: find_library/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
44-
- {name: find_library/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
37+
- {name: find_library/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
38+
- {name: find_library/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
39+
- {name: find_library/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF, commonvars: -DRYML_USE_LIBCXX=ON}
40+
- {name: find_library/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF, commonvars: -DRYML_USE_LIBCXX=ON}
41+
- {name: find_library/macos, sdir: test/test_install, os: macos-15-intel, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
42+
- {name: find_library/macos, sdir: test/test_install, os: macos-15-intel, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
43+
- {name: find_library/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
44+
- {name: find_library/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
4545

46-
- {name: singleheader/linux, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release}
47-
- {name: singleheader/linux, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug}
48-
- {name: singleheader/linux/libcxx, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, commonvars: -DRYML_USE_LIBCXX=ON}
49-
- {name: singleheader/linux/libcxx, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, commonvars: -DRYML_USE_LIBCXX=ON}
50-
- {name: singleheader/macos, sdir: test/test_singleheader, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release}
51-
- {name: singleheader/macos, sdir: test/test_singleheader, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug}
52-
- {name: singleheader/win, sdir: test/test_singleheader, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release}
53-
- {name: singleheader/win, sdir: test/test_singleheader, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug}
46+
- {name: singleheader/linux, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release}
47+
- {name: singleheader/linux, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug}
48+
- {name: singleheader/linux/libcxx, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, commonvars: -DRYML_USE_LIBCXX=ON}
49+
- {name: singleheader/linux/libcxx, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, commonvars: -DRYML_USE_LIBCXX=ON}
50+
- {name: singleheader/macos, sdir: test/test_singleheader, os: macos-15-intel, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release}
51+
- {name: singleheader/macos, sdir: test/test_singleheader, os: macos-15-intel, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug}
52+
- {name: singleheader/win, sdir: test/test_singleheader, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release}
53+
- {name: singleheader/win, sdir: test/test_singleheader, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug}
5454

5555
env:
5656
CXX_: ${{matrix.cxx}}

‎.github/workflows-in/macosx.ys‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,15 @@
66
jobs:
77
macosx:
88
:: setup-job('macosx' 'macosx')
9-
runs-on: macos-13
9+
runs-on: macos-15-intel
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
include::
14-
? for
15-
xcver [15 14]
16-
std [11 17]
17-
bt qw(Debug Release)
18-
: !
19-
std:: std
20-
cxx: xcode
21-
xcver:: xcver
22-
bt:: bt
23-
bitlinks: shared64 static64
13+
include:
14+
- {std: 11, cxx: xcode, xcver: 16, bt: Debug , bitlinks: shared64 static64}
15+
- {std: 11, cxx: xcode, xcver: 16, bt: Release, bitlinks: shared64 static64}
16+
- {std: 17, cxx: xcode, xcver: 16, bt: Debug , bitlinks: shared64 static64}
17+
- {std: 17, cxx: xcode, xcver: 16, bt: Release, bitlinks: shared64 static64}
2418
env:: load('share/env.yaml')
2519
steps:
2620
- :: checkout-action

‎.github/workflows-in/release.ys‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,52 +18,52 @@ python-wheel-matrix =::
1818
- ! pywhl('3.13' 313 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
1919
- ! pywhl('3.13' 313 'i686' 'manylinux_i686' 'ubuntu-24.04')
2020
- ! pywhl('3.13' 313 'aarch64' 'manylinux_aarch64' 'ubuntu-24.04-arm')
21-
- ! pywhl('3.13' 313 'x86_64' 'macosx_x86_64' 'macos-13' )
21+
- ! pywhl('3.13' 313 'x86_64' 'macosx_x86_64' 'macos-15-intel')
2222
- ! pywhl('3.13' 313 'arm64' 'macosx_arm64' 'macos-latest')
2323
- ! pywhl('3.13' 313 'universal2' 'macosx_universal2' 'macos-latest')
2424
# pyv arch platform os
2525
- ! pywhl('3.12' 312 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
2626
- ! pywhl('3.12' 312 'i686' 'manylinux_i686' 'ubuntu-24.04')
2727
- ! pywhl('3.12' 312 'aarch64' 'manylinux_aarch64' 'ubuntu-24.04-arm')
28-
- ! pywhl('3.12' 312 'x86_64' 'macosx_x86_64' 'macos-13' )
28+
- ! pywhl('3.12' 312 'x86_64' 'macosx_x86_64' 'macos-15-intel')
2929
- ! pywhl('3.12' 312 'arm64' 'macosx_arm64' 'macos-latest')
3030
- ! pywhl('3.12' 312 'universal2' 'macosx_universal2' 'macos-latest')
3131
# pyv arch platform os
3232
- ! pywhl('3.11' 311 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
3333
- ! pywhl('3.11' 311 'i686' 'manylinux_i686' 'ubuntu-24.04')
3434
- ! pywhl('3.11' 311 'aarch64' 'manylinux_aarch64' 'ubuntu-24.04-arm')
35-
- ! pywhl('3.11' 311 'x86_64' 'macosx_x86_64' 'macos-13' )
35+
- ! pywhl('3.11' 311 'x86_64' 'macosx_x86_64' 'macos-15-intel')
3636
- ! pywhl('3.11' 311 'arm64' 'macosx_arm64' 'macos-latest')
3737
- ! pywhl('3.11' 311 'universal2' 'macosx_universal2' 'macos-latest')
3838
# pyv arch platform os
3939
- ! pywhl('3.10' 310 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
4040
- ! pywhl('3.10' 310 'i686' 'manylinux_i686' 'ubuntu-24.04')
4141
- ! pywhl('3.10' 310 'aarch64' 'manylinux_aarch64' 'ubuntu-24.04-arm')
42-
- ! pywhl('3.10' 310 'x86_64' 'macosx_x86_64' 'macos-13' )
42+
- ! pywhl('3.10' 310 'x86_64' 'macosx_x86_64' 'macos-15-intel')
4343
- ! pywhl('3.10' 310 'arm64' 'macosx_arm64' 'macos-latest')
4444
- ! pywhl('3.10' 310 'universal2' 'macosx_universal2' 'macos-latest')
4545
# pyv arch platform os
4646
- ! pywhl('3.9' 39 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
4747
- ! pywhl('3.9' 39 'i686' 'manylinux_i686' 'ubuntu-24.04')
4848
- ! pywhl('3.9' 39 'aarch64' 'manylinux_aarch64' 'ubuntu-24.04-arm')
49-
- ! pywhl('3.9' 39 'x86_64' 'macosx_x86_64' 'macos-13' )
49+
- ! pywhl('3.9' 39 'x86_64' 'macosx_x86_64' 'macos-15-intel')
5050
- ! pywhl('3.9' 39 'arm64' 'macosx_arm64' 'macos-latest')
5151
- ! pywhl('3.9' 39 'universal2' 'macosx_universal2' 'macos-latest')
5252
# pyv arch platform os
5353
- ! pywhl('3.8' 38 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
5454
- ! pywhl('3.8' 38 'i686' 'manylinux_i686' 'ubuntu-24.04')
5555
- ! pywhl('3.8' 38 'aarch64' 'manylinux_aarch64' 'ubuntu-24.04-arm')
56-
- ! pywhl('3.8' 38 'x86_64' 'macosx_x86_64' 'macos-13' )
56+
- ! pywhl('3.8' 38 'x86_64' 'macosx_x86_64' 'macos-15-intel')
5757
#- ! pywhl('3.8' 38 'arm64' 'macosx_arm64' 'macos-14' ) # disabled: https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64
5858
#- ! pywhl('3.8' 38 'universal2' 'macosx_universal2' 'macos-14' ) # disabled: https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64
5959
# pyv arch platform os
6060
- ! pywhl('3.7' 37 'x86_64' 'manylinux_x86_64' 'ubuntu-22.04')
6161
- ! pywhl('3.7' 37 'i686' 'manylinux_i686' 'ubuntu-22.04')
62-
- ! pywhl('3.7' 37 'x86_64' 'macosx_x86_64' 'macos-13' )
62+
- ! pywhl('3.7' 37 'x86_64' 'macosx_x86_64' 'macos-15-intel')
6363
# pyv arch platform os
6464
#- ! pywhl('3.6' 36 'x86_64' 'manylinux_x86_64' 'ubuntu-20.04') # setup-python 3.6 requires ubuntu 20.04
6565
#- ! pywhl('3.6' 36 'i686' 'manylinux_i686' 'ubuntu-20.04') # setup-python 3.6 requires ubuntu 20.04
66-
- ! pywhl('3.6' 36 'x86_64' 'macosx_x86_64' 'macos-13' )
66+
#- ! pywhl('3.6' 36 'x86_64' 'macosx_x86_64' 'macos-15-intel')
6767

6868

6969
python-wheel-matrix-win =::

‎.github/workflows/api.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- pythonv: '3.13'
3232
os: ubuntu-latest
3333
- pythonv: '3.13'
34-
os: macos-13
34+
os: macos-15-intel
3535
steps:
3636
- name: checkout (action)
3737
uses: actions/checkout@v4
@@ -85,7 +85,7 @@ jobs:
8585
- pythonv: '3.13'
8686
os: ubuntu-latest
8787
- pythonv: '3.13'
88-
os: macos-13
88+
os: macos-15-intel
8989
env:
9090
CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILES=ON
9191
steps:

‎.github/workflows/install.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ jobs:
6666
commonvars: -DRYML_USE_LIBCXX=ON
6767
- name: find_package/macos
6868
sdir: test/test_install
69-
os: macos-13
69+
os: macos-15-intel
7070
cxx: xcode
7171
gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
7272
tgt: ALL_BUILD
7373
bt: Release
7474
vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON
7575
- name: find_package/macos
7676
sdir: test/test_install
77-
os: macos-13
77+
os: macos-15-intel
7878
cxx: xcode
7979
gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
8080
tgt: ALL_BUILD
@@ -132,15 +132,15 @@ jobs:
132132
commonvars: -DRYML_USE_LIBCXX=ON
133133
- name: find_library/macos
134134
sdir: test/test_install
135-
os: macos-13
135+
os: macos-15-intel
136136
cxx: xcode
137137
gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
138138
tgt: ALL_BUILD
139139
bt: Release
140140
vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF
141141
- name: find_library/macos
142142
sdir: test/test_install
143-
os: macos-13
143+
os: macos-15-intel
144144
cxx: xcode
145145
gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
146146
tgt: ALL_BUILD
@@ -194,14 +194,14 @@ jobs:
194194
commonvars: -DRYML_USE_LIBCXX=ON
195195
- name: singleheader/macos
196196
sdir: test/test_singleheader
197-
os: macos-13
197+
os: macos-15-intel
198198
cxx: xcode
199199
gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
200200
tgt: ALL_BUILD
201201
bt: Release
202202
- name: singleheader/macos
203203
sdir: test/test_singleheader
204-
os: macos-13
204+
os: macos-15-intel
205205
cxx: xcode
206206
gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
207207
tgt: ALL_BUILD

0 commit comments

Comments
 (0)