Skip to content

Commit 572833a

Browse files
authored
update macos runners (#255)
* update macos runners * use macos-15-intel * remove python38 workaround
1 parent 9e8ba58 commit 572833a

File tree

1 file changed

+6
-30
lines changed

1 file changed

+6
-30
lines changed

.github/workflows/build_wheels.yaml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,17 @@ jobs:
205205
name: wheels-${{ matrix.os }}-${{ env.CIBW_BUILD_SANITIZED }}-${{ matrix.cibw_archs }}
206206
path: wheelhouse/*.whl
207207

208-
build_wheels_macos:
208+
build_wheels_macos_x86_64:
209209
name: '${{ matrix.os }} ${{ matrix.cibw_archs }} ${{ matrix.cibw_build }}'
210210
runs-on: ${{ matrix.os }}
211211
strategy:
212212
fail-fast: false
213213
matrix:
214-
os: [macos-13] # x86_64 runner
214+
os: [macos-15-intel]
215215
cibw_build: ['cp39-*', 'cp310-*', 'cp311-*', 'cp312-*', 'cp313-*', 'cp314-*']
216216
cibw_archs: ['x86_64']
217217
env:
218218
PYTHON: 3.12
219-
SYSTEM_VERSION_COMPAT: 0 # https://github.com/actions/setup-python/issues/469#issuecomment-1192522949
220219

221220
steps:
222221
- name: Check out repository
@@ -253,7 +252,7 @@ jobs:
253252
runs-on: ${{ matrix.os }}
254253
strategy:
255254
matrix:
256-
os: [macos-14] # ARM runner
255+
os: [macos-15] # ARM runner
257256
cibw_build: ['cp39-*', 'cp310-*', 'cp311-*', 'cp312-*', 'cp313-*', 'cp314-*']
258257
cibw_archs: ['arm64']
259258
env:
@@ -279,38 +278,15 @@ jobs:
279278
uses: pypa/[email protected]
280279
env:
281280
CIBW_BUILD_FRONTEND: 'pip'
282-
CIBW_BUILD: ${{ matrix.cibw_build }}
283281
CIBW_ARCHS: ${{ matrix.cibw_archs }}
284-
CIBW_TEST_SKIP: '*-macosx_arm64'
282+
CIBW_BUILD: ${{ matrix.cibw_build }}
285283
CIBW_TEST_REQUIRES: pytest
286284
CIBW_TEST_COMMAND: pytest {package}/tests
287-
CIBW_REPAIR_WHEEL_COMMAND: |
288-
echo "Target delocate archs: {delocate_archs}"
289-
290-
ORIGINAL_WHEEL={wheel}
291-
292-
echo "Running delocate-listdeps to list linked original wheel dependencies"
293-
delocate-listdeps --all $ORIGINAL_WHEEL
294-
295-
echo "Renaming .whl file when architecture is 'macosx_arm64'"
296-
RENAMED_WHEEL=${ORIGINAL_WHEEL//x86_64/arm64}
297-
298-
echo "Wheel will be renamed to $RENAMED_WHEEL"
299-
mv $ORIGINAL_WHEEL $RENAMED_WHEEL
300-
301-
echo "Running delocate-wheel command on $RENAMED_WHEEL"
302-
delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v $RENAMED_WHEEL
303-
304-
echo "Running delocate-listdeps to list linked wheel dependencies"
305-
WHEEL_SIMPLE_FILENAME="${RENAMED_WHEEL##*/}"
306-
delocate-listdeps --all {dest_dir}/$WHEEL_SIMPLE_FILENAME
307-
308-
echo "DONE."
309285

310286
- uses: actions/upload-artifact@v4
311287
with:
312288
name: wheels-${{ matrix.os }}-${{ env.CIBW_BUILD_SANITIZED }}-${{ matrix.cibw_archs }}
313-
path: ./wheelhouse/*.whl
289+
path: wheelhouse/*.whl
314290

315291
validate_wheels:
316292
name: 'Validate wheels'
@@ -320,7 +296,7 @@ jobs:
320296
'build_wheels_windows',
321297
'build_wheels_windows_arm64',
322298
'build_wheels_linux',
323-
'build_wheels_macos',
299+
'build_wheels_macos_x86_64',
324300
'build_wheels_macos_arm64',
325301
]
326302
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)