From 046c8162766a51fc79834d38dfc0e1144d2e458a Mon Sep 17 00:00:00 2001
From: julianz- <6255571+julianz-@users.noreply.github.com>
Date: Thu, 22 Oct 2026 15:56:24 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA=20Bump=20macOS=20Tests=20runners?=
 =?UTF-8?q?=20to=20macos-26,=20raise=20timeout=20to=209=20minutes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

macos-15 and macos-15-intel are GitHub's previous-generation macOS
runner images; macos-26 and macos-26-intel are current.

The matrix's 7-minute timeout-minutes was cancelling jobs on the old
images that had already passed every step. Measured the worst case
on the new images across three runs: ~3.15.0-0 @ macos-26-intel took
4m26s, 6m33s, and 6m05s. 9 minutes applies a 30% margin over the
slowest of those.
---
 .github/workflows/ci-cd.yml                | 10 +++++-----
 docs/changelog-fragments.d/862.contrib.rst |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 docs/changelog-fragments.d/862.contrib.rst

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 6287e68db8..1018a84d12 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -747,10 +747,10 @@ jobs:
         runner-vm-os:
         - ubuntu-24.04-arm
         - ubuntu-24.04
-        - macos-15
+        - macos-26
         - windows-2025
         - ubuntu-22.04
-        - macos-15-intel
+        - macos-26-intel
         - windows-2022
         toxenv:
         - py
@@ -767,9 +767,9 @@ jobs:
         # NOTE: macOS PyPy 3.11 jobs are excluded because they flakily
         # NOTE: crash `pytest-xdist` workers.
         # NOTE: They should be re-added once it's fixed.
-        - runner-vm-os: macos-15
+        - runner-vm-os: macos-26
           python-version: pypy-3.11-v7.3.23
-        - runner-vm-os: macos-15-intel
+        - runner-vm-os: macos-26-intel
           python-version: pypy-3.11-v7.3.23
 
     uses: tox-dev/workflow/.github/workflows/reusable-tox.yml@1bb961580e20073f66ccb9024f248357f8c8fecb  # yamllint disable-line rule:line-length
@@ -801,7 +801,7 @@ jobs:
         ${{ matrix.runner-vm-os }}
       source-tarball-name: >-
         ${{ needs.pre-setup.outputs.sdist-artifact-name }}
-      timeout-minutes: 7
+      timeout-minutes: 9
       toxenv: >-
         ${{ matrix.toxenv }}
       # tox-provision-args: >-
diff --git a/docs/changelog-fragments.d/862.contrib.rst b/docs/changelog-fragments.d/862.contrib.rst
new file mode 100644
index 0000000000..465b0a3547
--- /dev/null
+++ b/docs/changelog-fragments.d/862.contrib.rst
@@ -0,0 +1,7 @@
+Bumped the macOS runners in CI's test matrix from
+``macos-15``/``macos-15-intel`` to ``macos-26``/``macos-26-intel``,
+and raised the matrix's ``timeout-minutes`` from 7 to 9: jobs on
+the old images had started occasionally needing more than 7
+minutes to finish, getting cancelled as a result.
+
+-- by :user:`julianz-`