Replace the macos-13 images with the macos-15-intel images (GHA) (#2601)
Replace `macos-13` images with `macos-15-intel`
This commit is contained in:
@@ -69,17 +69,17 @@ jobs:
|
|||||||
python_version: '3.13'
|
python_version: '3.13'
|
||||||
- os: windows-11-arm
|
- os: windows-11-arm
|
||||||
python_version: '3.13'
|
python_version: '3.13'
|
||||||
- os: macos-13
|
- os: macos-15-intel
|
||||||
python_version: '3.13'
|
python_version: '3.13'
|
||||||
- os: macos-15
|
- os: macos-15
|
||||||
python_version: '3.13'
|
python_version: '3.13'
|
||||||
- os: macos-13
|
- os: macos-15-intel
|
||||||
python_version: '3.13'
|
python_version: '3.13'
|
||||||
test_select: ios
|
test_select: ios
|
||||||
- os: macos-14 # See https://github.com/actions/runner-images/issues/12777
|
- os: macos-14 # See https://github.com/actions/runner-images/issues/12777
|
||||||
python_version: '3.13'
|
python_version: '3.13'
|
||||||
test_select: ios
|
test_select: ios
|
||||||
- os: macos-13
|
- os: macos-15-intel
|
||||||
python_version: '3.13'
|
python_version: '3.13'
|
||||||
test_select: android
|
test_select: android
|
||||||
- os: macos-15
|
- os: macos-15
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ Usage
|
|||||||
<sup>² [Uses cross-compilation](https://cibuildwheel.pypa.io/en/stable/faq/#windows-arm64). It is not possible to test `arm64` on this CI platform.</sup><br>
|
<sup>² [Uses cross-compilation](https://cibuildwheel.pypa.io/en/stable/faq/#windows-arm64). It is not possible to test `arm64` on this CI platform.</sup><br>
|
||||||
<sup>³ Requires a macOS runner; runs tests on the simulator for the runner's architecture. </sup><br>
|
<sup>³ Requires a macOS runner; runs tests on the simulator for the runner's architecture. </sup><br>
|
||||||
<sup>⁴ Building for Android requires the runner to be Linux x86_64, macOS ARM64 or macOS x86_64. Testing has [additional requirements](https://cibuildwheel.pypa.io/en/stable/platforms/#android).</sup><br>
|
<sup>⁴ Building for Android requires the runner to be Linux x86_64, macOS ARM64 or macOS x86_64. Testing has [additional requirements](https://cibuildwheel.pypa.io/en/stable/platforms/#android).</sup><br>
|
||||||
<sup>⁵ The `macos-15` and `macos-latest` images are [incompatible with cibuildwheel at this time](platforms/#ios-system-requirements)</sup><br>
|
<sup>⁵ The `macos-15` and `macos-latest` images are [incompatible with cibuildwheel at this time](platforms/#ios-system-requirements)</sup><br> when building iOS wheels.
|
||||||
|
|
||||||
<!--intro-end-->
|
<!--intro-end-->
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-latest]
|
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-latest]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
|
|||||||
+1
-1
@@ -121,7 +121,7 @@ See [GitHub issue 1333](https://github.com/pypa/cibuildwheel/issues/1333) for mo
|
|||||||
|
|
||||||
It's easiest to build `x86_64` wheels on `x86_64` runners, and `arm64` wheels on `arm64` runners.
|
It's easiest to build `x86_64` wheels on `x86_64` runners, and `arm64` wheels on `arm64` runners.
|
||||||
|
|
||||||
On GitHub Actions, `macos-14` runners are `arm64`, and `macos-13` runners are `x86_64`. So all you need to do is ensure both are in your build matrix.
|
On GitHub Actions, `macos-14` runners are `arm64`, and `macos-15-intel` runners are `x86_64`. So all you need to do is ensure both are in your build matrix.
|
||||||
|
|
||||||
#### Cross-compiling
|
#### Cross-compiling
|
||||||
|
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ jobs:
|
|||||||
- os: windows-arm
|
- os: windows-arm
|
||||||
runs-on: windows-11-arm
|
runs-on: windows-11-arm
|
||||||
- os: macos-intel
|
- os: macos-intel
|
||||||
# macos-13 was the last x86_64 runner
|
# macos-15-intel is the last x86_64 runner
|
||||||
runs-on: macos-13
|
runs-on: macos-15-intel
|
||||||
- os: macos-arm
|
- os: macos-arm
|
||||||
# macos-14+ (including latest) are ARM64 runners
|
# macos-14+ (including latest) are ARM64 runners
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
# macos-13 is an intel runner, macos-14 is apple silicon
|
# macos-15-intel is an Intel runner, macos-14 is Apple silicon
|
||||||
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-14]
|
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-14]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
# macos-13 is an intel runner, macos-14 is apple silicon
|
# macos-15-intel is an Intel runner, macos-14 is Apple silicon
|
||||||
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-14]
|
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-14]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
# macos-13 is an intel runner, macos-14 is apple silicon
|
# macos-15-intel is an Intel runner, macos-14 is Apple silicon
|
||||||
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-14]
|
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-14]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
|
|||||||
Reference in New Issue
Block a user