Skip to content

Commit ea2d483

Browse files
authored
ci: stop running on macos-13 (#5316)
* ci: stop running on macos-13 * try to install 3.9 from uv * disable 3.9 uv build for now, fix windows x86
1 parent 2bd4ad2 commit ea2d483

File tree

2 files changed

+25
-41
lines changed

2 files changed

+25
-41
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,23 @@ jobs:
4343
# with the commit diff, because the merge may affect line numbers.
4444
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
4545

46-
- name: Set up Python ${{ inputs.python-version }}
46+
# installs using setup-python do not work for arm macOS 3.9 and below
47+
- if: ${{ !(inputs.os == 'macos-latest' && contains(fromJSON('["3.7", "3.8", "3.9"]'), inputs.python-version) && inputs.python-architecture == 'x64') }}
48+
name: Set up Python ${{ inputs.python-version }}
4749
uses: actions/setup-python@v5
4850
with:
4951
python-version: ${{ inputs.python-version }}
5052
architecture: ${{ inputs.python-architecture }}
5153
# PyPy can have FFI changes within Python versions, which creates pain in CI
5254
check-latest: ${{ startsWith(inputs.python-version, 'pypy') }}
5355

56+
# workaround for the above, only available for 3.9
57+
- if: ${{ inputs.os == 'macos-latest' && contains(fromJSON('["3.9"]'), inputs.python-version) && inputs.python-architecture == 'x64' }}
58+
name: Set up Python ${{ inputs.python-version }}
59+
uses: astral-sh/setup-uv@v5
60+
with:
61+
python-version: cpython-${{ inputs.python-version }}-macos-x86-64
62+
5463
- name: Install nox
5564
run: python -m pip install --upgrade pip && pip install nox[uv]
5665

.github/workflows/ci.yml

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,13 @@ jobs:
146146
matrix:
147147
rust: [stable]
148148
python-version: ["3.13"]
149-
platform: [
149+
platform:
150+
[
150151
{
151-
os: "macos-latest", # first available arm macos runner
152+
os: "macos-latest",
152153
python-architecture: "arm64",
153154
rust-target: "aarch64-apple-darwin",
154155
},
155-
{
156-
os: "macos-13", # last available x86_64 macos runner
157-
python-architecture: "x64",
158-
rust-target: "x86_64-apple-darwin",
159-
},
160156
{
161157
os: "ubuntu-latest",
162158
python-architecture: "x64",
@@ -316,7 +312,7 @@ jobs:
316312
python-version: "3.13"
317313
platform:
318314
{
319-
os: "macos-13",
315+
os: "macos-latest",
320316
python-architecture: "x64",
321317
rust-target: "x86_64-apple-darwin",
322318
}
@@ -330,32 +326,17 @@ jobs:
330326
rust-target: "x86_64-unknown-linux-gnu",
331327
}
332328

333-
# arm64 macOS Python not available on GitHub Actions until 3.10
334-
# so backfill 3.7-3.9 with x64 macOS runners
335-
- rust: stable
336-
python-version: "3.7"
337-
platform:
338-
{
339-
os: "macos-13",
340-
python-architecture: "x64",
341-
rust-target: "x86_64-apple-darwin",
342-
}
343-
- rust: stable
344-
python-version: "3.8"
345-
platform:
346-
{
347-
os: "macos-13",
348-
python-architecture: "x64",
349-
rust-target: "x86_64-apple-darwin",
350-
}
351-
- rust: stable
352-
python-version: "3.9"
353-
platform:
354-
{
355-
os: "macos-13",
356-
python-architecture: "x64",
357-
rust-target: "x86_64-apple-darwin",
358-
}
329+
# arm64 macOS Python not available on GitHub Actions until 3.10,
330+
# and 3.7 & 3.8 not available to install from uv, but can backfill 3.9 with x64 from uv
331+
# FIXME: setup-uv issue prevents this from working, https://github.com/astral-sh/setup-uv/issues/554
332+
# - rust: stable
333+
# python-version: "3.9"
334+
# platform:
335+
# {
336+
# os: "macos-latest",
337+
# python-architecture: "x64",
338+
# rust-target: "x86_64-apple-darwin",
339+
# }
359340
# arm64 Linux runner is in public preview, so test 3.13 on it
360341
- rust: stable
361342
python-version: "3.13"
@@ -618,12 +599,6 @@ jobs:
618599
- os: "ubuntu-latest"
619600
target: "x86_64-pc-windows-gnu"
620601
flags: "-i python3.13 --features generate-import-lib"
621-
# macos x86_64 -> aarch64
622-
- os: "macos-13" # last x86_64 macos runners
623-
target: "aarch64-apple-darwin"
624-
# macos aarch64 -> x86_64
625-
- os: "macos-latest"
626-
target: "x86_64-apple-darwin"
627602
# windows x86_64 -> aarch64
628603
- os: "windows-latest"
629604
target: "aarch64-pc-windows-msvc"

0 commit comments

Comments
 (0)