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-`