Skip to content

Commit f131aa6

Browse files
authored
Use macOS xlarge runner for Apple Silicon wheels (#2506)
1 parent 89f30fd commit f131aa6

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
python-version: ["3.8"]
16-
os: ["macos-latest", "ubuntu-latest", "windows-latest"]
15+
python-version: ["3.10"]
16+
os: ["macos-latest", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
1717
fail-fast: false
1818

1919
steps:

.github/workflows/wheel.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
os: ["macos-latest", "ubuntu-latest", "windows-latest"]
18+
os: ["macos-latest", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
1919
cibw_arch: ["native"]
2020
# Build one wheel (ABI = none) using first build spec, then test on all python versions.
21-
cibw_build: ["cp37-* cp38-* cp39-* cp310-* cp311-*"]
21+
cibw_build: ["cp39-* cp310-* cp311-*"]
2222
include:
2323
- os: ubuntu-latest
2424
cibw_arch: aarch64
2525
# Each test takes 30 mins, which is too long to run sequentially, so we test once only.
26-
cibw_build: "cp37-*"
26+
cibw_build: "cp39-*"
2727
fail-fast: false
2828

2929
steps:
@@ -36,7 +36,14 @@ jobs:
3636
Echo "OS_VERSION=$os_version" >> $env:GITHUB_ENV
3737
3838
- name: "Checkout repo"
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
40+
41+
# Temporary, until pipx is added to the macOS large runner image
42+
- name: "Install pipx"
43+
if: matrix.os == 'macos-latest-xlarge'
44+
run: |
45+
brew install pipx
46+
pipx ensurepath
4047
4148
- name: "Restore RTools40"
4249
if: startsWith(runner.os, 'Windows')
@@ -53,7 +60,7 @@ jobs:
5360
platforms: arm64
5461

5562
- name: "Build wheels"
56-
uses: pypa/cibuildwheel@v2.11.4
63+
uses: pypa/cibuildwheel@v2.16.2
5764
with:
5865
package-dir: python
5966
env:

0 commit comments

Comments
 (0)