From 965569a56dc2924b490320990fb99a7a17f9a5a3 Mon Sep 17 00:00:00 2001 From: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com> Date: Wed, 25 Mar 2026 06:15:46 -0500 Subject: [PATCH] gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (GH-145099) (cherry picked from commit 4240c7dd7499c9024bae73a31fb25697203ae615) Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com> --- .github/actionlint.yaml | 5 +++++ .github/workflows/build.yml | 12 ++++++------ .github/workflows/jit.yml | 4 ++-- .github/workflows/reusable-macos.yml | 6 +++--- .github/workflows/tail-call.yml | 4 ++-- 5 files changed, 18 insertions(+), 13 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 caa3f5ac6a897d..055fa7c0cdb7cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -240,16 +240,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: @@ -369,7 +369,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 1cdd746e0af5cb..81db07fffa5eeb 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -96,9 +96,9 @@ jobs: - false include: - target: x86_64-apple-darwin/clang - runner: macos-15-intel + runner: macos-26-intel - target: aarch64-apple-darwin/clang - runner: macos-14 + runner: macos-26 steps: - uses: actions/checkout@v6 with: diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml index 8291d30644ff51..c0274c7a964781 100644 --- a/.github/workflows/reusable-macos.yml +++ b/.github/workflows/reusable-macos.yml @@ -52,15 +52,15 @@ jobs: --prefix=/opt/python-dev \ --with-openssl="$(brew --prefix openssl@3.0)" - name: Build CPython - if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }} + if : ${{ inputs.free-threading || inputs.os != 'macos-26-intel' }} run: gmake -j8 - name: Build CPython for compiler warning check - if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }} + if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }} run: set -o pipefail; gmake -j8 --output-sync 2>&1 | tee compiler_output_macos.txt - name: Display build info run: make pythoninfo - name: Check compiler warnings - if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }} + if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }} run: >- python3 Tools/build/check_warnings.py --compiler-output-file-path=compiler_output_macos.txt diff --git a/.github/workflows/tail-call.yml b/.github/workflows/tail-call.yml index ac8f47a881685e..f1e342bbac28a7 100644 --- a/.github/workflows/tail-call.yml +++ b/.github/workflows/tail-call.yml @@ -66,9 +66,9 @@ jobs: matrix: include: - target: x86_64-apple-darwin/clang - runner: macos-15-intel + runner: macos-26-intel - target: aarch64-apple-darwin/clang - runner: macos-14 + runner: macos-26 steps: - uses: actions/checkout@v6 with: