From 2ccc917427549fce9c35a1fb81731bd90d383d01 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 25 Mar 2026 12:41:12 +0100 Subject: [PATCH 1/2] [3.13] gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (GH-145099) (GH-146412) (cherry picked from commit ce789046015205bb2a0ad92c669287d8c3519615) Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com> --- .github/actionlint.yaml | 5 +++++ .github/workflows/build.yml | 12 ++++++------ .github/workflows/jit.yml | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index eacfff24889021..3004466b80e91c 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -1,3 +1,8 @@ +self-hosted-runner: + # Pending release of actionlint > 1.7.11 for macos-26-intel support + # https://github.com/rhysd/actionlint/pull/629 + labels: ["macos-26-intel"] + config-variables: null paths: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ec0c8967ef58e..a95a1f233c4af0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -246,16 +246,16 @@ jobs: strategy: fail-fast: false matrix: - # macos-14 is M1, macos-15-intel is Intel. - # macos-15-intel only runs tests against the GIL-enabled CPython. + # macos-26 is Apple Silicon, macos-26-intel is Intel. + # macos-26-intel only runs tests against the GIL-enabled CPython. os: - - macos-14 - - macos-15-intel + - macos-26 + - macos-26-intel free-threading: - false - true exclude: - - os: macos-15-intel + - os: macos-26-intel free-threading: true uses: ./.github/workflows/reusable-macos.yml with: @@ -341,7 +341,7 @@ jobs: matrix: include: - arch: aarch64 - runs-on: macos-14 + runs-on: macos-26 - arch: x86_64 runs-on: ubuntu-24.04 diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index 70b74ce5c7f5a4..e62756f8fb8023 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -82,7 +82,7 @@ jobs: compiler: msvc - target: x86_64-apple-darwin/clang architecture: x86_64 - runner: macos-15-intel + runner: macos-26-intel compiler: clang - target: aarch64-apple-darwin/clang architecture: aarch64 From c8a48832e1d57836505109c887afa756b6b1956f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 25 Mar 2026 13:55:14 +0200 Subject: [PATCH 2/2] fixup! [3.13] gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (GH-145099) (GH-146412) (cherry picked from commit ce789046015205bb2a0ad92c669287d8c3519615) --- .github/workflows/jit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index e62756f8fb8023..fc019fb0d32677 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -86,7 +86,7 @@ jobs: compiler: clang - target: aarch64-apple-darwin/clang architecture: aarch64 - runner: macos-14 + runner: macos-26 compiler: clang - target: x86_64-unknown-linux-gnu/gcc architecture: x86_64