Skip to content

Commit e1c8b29

Browse files
committed
BLD: build macOS x86-64 wheels on macOS 15, stop using deprecated macos-13
Similar to the change in numpy#29886
1 parent e0cb6ae commit e1c8b29

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/wheels.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ jobs:
5252
- [ubuntu-22.04, musllinux_x86_64, ""]
5353
- [ubuntu-22.04-arm, manylinux_aarch64, ""]
5454
- [ubuntu-22.04-arm, musllinux_aarch64, ""]
55-
- [macos-13, macosx_x86_64, openblas]
55+
- [macos-15-intel, macosx_x86_64, openblas]
5656

5757
# targeting macos >= 14. Could probably build on macos-14, but it would be a cross-compile
58-
- [macos-13, macosx_x86_64, accelerate]
58+
- [macos-15-intel, macosx_x86_64, accelerate]
5959
- [macos-14, macosx_arm64, openblas]
6060
- [macos-14, macosx_arm64, accelerate]
6161
- [windows-2022, win_amd64, ""]
@@ -74,9 +74,9 @@ jobs:
7474
python: "pp311"
7575
- buildplat: [ ubuntu-22.04-arm, musllinux_aarch64, "" ]
7676
python: "pp311"
77-
- buildplat: [ macos13, macosx_x86_64, openblas ]
77+
- buildplat: [ macos-15-intel, macosx_x86_64, openblas ]
7878
python: "cp313t"
79-
- buildplat: [ macos13, macosx_x86_64, openblas ]
79+
- buildplat: [ macos-15-intel, macosx_x86_64, openblas ]
8080
python: "cp314t"
8181
include:
8282
- buildplat: [ ubuntu-22.04, pyodide_wasm32, "" ]
@@ -122,7 +122,7 @@ jobs:
122122
echo "CIBW_ENVIRONMENT_WINDOWS=PKG_CONFIG_PATH=$CIBW" >> $env:GITHUB_ENV
123123
124124
- name: Setup macOS
125-
if: matrix.buildplat[0] == 'macos-13' || matrix.buildplat[0] == 'macos-14'
125+
if: startsWith(matrix.buildplat[0], 'macos')
126126
run: |
127127
# Needed due to https://github.com/actions/runner-images/issues/3371
128128
# Supported versions: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
@@ -133,10 +133,6 @@ jobs:
133133
if [[ ${{ matrix.buildplat[2] }} == 'accelerate' ]]; then
134134
# Builds with Accelerate only target macOS>=14.0
135135
echo "CIBW_ENVIRONMENT_MACOS=MACOSX_DEPLOYMENT_TARGET=14.0 INSTALL_OPENBLAS=false" >> "$GITHUB_ENV"
136-
137-
# the macos-13 image that's used for building the x86_64 wheel can't test
138-
# a wheel with deployment target >= 14 without further work
139-
echo "CIBW_TEST_SKIP=*-macosx_x86_64" >> "$GITHUB_ENV"
140136
else
141137
echo "CIBW_ENVIRONMENT_MACOS=PKG_CONFIG_PATH=$PWD/.openblas" >> "$GITHUB_ENV"
142138
fi

0 commit comments

Comments
 (0)