From 141a8f742af5060a9a3069e00aa191f84dc28ecc Mon Sep 17 00:00:00 2001
From: Jacob Coffee <jacob@z7x.org>
Date: Fri, 3 Oct 2025 15:49:03 -0400
Subject: [PATCH 1/2] [3.13] gh-137638: Use macos-15-intel in GitHub Actions
 (GH-139154) (cherry picked from commit
 1ae92503647328544866f9586f57eec285e1949a)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jacob Coffee <jacob@z7x.org>
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 .github/workflows/build.yml | 6 +++---
 .github/workflows/jit.yml   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 68913ec826999c6..19cefaf4d215fcb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -255,13 +255,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Cirrus and macos-14 are M1, macos-13 is default GHA Intel.
+        # Cirrus and macos-14 are M1, macos-15-intel is default GHA Intel.
         # macOS 13 only runs tests against the GIL-enabled CPython.
         # Cirrus used for upstream, macos-14 for forks.
         os:
         - ghcr.io/cirruslabs/macos-runner:sonoma
         - macos-14
-        - macos-13
+        - macos-15-intel
         is-fork:  # only used for the exclusion trick
         - ${{ github.repository_owner != 'python' }}
         free-threading:
@@ -272,7 +272,7 @@ jobs:
           is-fork: true
         - os: macos-14
           is-fork: false
-        - os: macos-13
+        - os: macos-15-intel
           free-threading: true
     uses: ./.github/workflows/reusable-macos.yml
     with:
diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml
index 2ba57a815a17598..76fa3744cd6861a 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-13
+            runner: macos-15-intel
             compiler: clang
           - target: aarch64-apple-darwin/clang
             architecture: aarch64
@@ -128,7 +128,7 @@ jobs:
           choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
           ./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
 
-      - name: Native macOS
+      - name: macOS
         if: runner.os == 'macOS'
         run: |
           brew update

From a8be963675dc4f4824a69bdddee1e7e0542abce2 Mon Sep 17 00:00:00 2001
From: Jacob Coffee <jacob@z7x.org>
Date: Wed, 8 Oct 2025 10:54:41 -0500
Subject: [PATCH 2/2] Update .github/workflows/jit.yml

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 .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 76fa3744cd6861a..2fcc4166e9e2a6f 100644
--- a/.github/workflows/jit.yml
+++ b/.github/workflows/jit.yml
@@ -128,7 +128,7 @@ jobs:
           choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
           ./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
 
-      - name: macOS
+      - name: Native macOS
         if: runner.os == 'macOS'
         run: |
           brew update