From 96574e4b5806bb5ba38f060db38a2ede34f69985 Mon Sep 17 00:00:00 2001 From: "Jonathan J. Helmus" Date: Fri, 11 Sep 2026 09:12:03 -0500 Subject: [PATCH 1/4] test out windows-11-vs2026-arm --- ci-runners.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ci-runners.yaml b/ci-runners.yaml index 91b0cbda5..b0dcaf17c 100644 --- a/ci-runners.yaml +++ b/ci-runners.yaml @@ -50,12 +50,7 @@ windows-2025-vs2026: platform: windows free: true -github-windows-11-aarch64-8: - arch: aarch64 - platform: windows - free: false - -windows-11-arm: +windows-11-vs2026-arm: arch: aarch64 platform: windows free: false From ba4b83d1f07da8f15efc54bc2d912bccc02dccf5 Mon Sep 17 00:00:00 2001 From: "Jonathan J. Helmus" Date: Fri, 11 Sep 2026 09:19:40 -0500 Subject: [PATCH 2/4] no VS init in GHA --- .github/workflows/windows.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2df8a7826..667ebb675 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -157,11 +157,6 @@ jobs: if: ${{ ! matrix.dry-run }} shell: cmd run: | - IF "%MATRIX_VS_VERSION%"=="2026" ( - call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%" - ) ELSE ( - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%" - ) uv run --no-dev build.py --python cpython-%MATRIX_PYTHON% --sh c:\cygwin\bin\sh.exe --options %MATRIX_BUILD_OPTIONS% --vs %MATRIX_VS_VERSION% env: MATRIX_VCVARS: ${{ matrix.vcvars }} From a09e9ef9c50eb33db8fb13da6dfa3c7d6a3e86ae Mon Sep 17 00:00:00 2001 From: "Jonathan J. Helmus" Date: Fri, 11 Sep 2026 09:25:36 -0500 Subject: [PATCH 3/4] Revert "no VS init in GHA" This reverts commit ba4b83d1f07da8f15efc54bc2d912bccc02dccf5. --- .github/workflows/windows.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 667ebb675..2df8a7826 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -157,6 +157,11 @@ jobs: if: ${{ ! matrix.dry-run }} shell: cmd run: | + IF "%MATRIX_VS_VERSION%"=="2026" ( + call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%" + ) ELSE ( + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%" + ) uv run --no-dev build.py --python cpython-%MATRIX_PYTHON% --sh c:\cygwin\bin\sh.exe --options %MATRIX_BUILD_OPTIONS% --vs %MATRIX_VS_VERSION% env: MATRIX_VCVARS: ${{ matrix.vcvars }} From 6c2c9d4c7092a2323a82a68b457ef05678218dc5 Mon Sep 17 00:00:00 2001 From: "Jonathan J. Helmus" Date: Fri, 11 Sep 2026 09:26:07 -0500 Subject: [PATCH 4/4] VS 2026 everywhere --- .github/workflows/windows.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2df8a7826..3b772848c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -157,11 +157,7 @@ jobs: if: ${{ ! matrix.dry-run }} shell: cmd run: | - IF "%MATRIX_VS_VERSION%"=="2026" ( - call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%" - ) ELSE ( - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%" - ) + call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%" uv run --no-dev build.py --python cpython-%MATRIX_PYTHON% --sh c:\cygwin\bin\sh.exe --options %MATRIX_BUILD_OPTIONS% --vs %MATRIX_VS_VERSION% env: MATRIX_VCVARS: ${{ matrix.vcvars }}