From df7f04a807f8fb790ea1a657c296165bee043086 Mon Sep 17 00:00:00 2001 From: Paul LeMarquand Date: Mon, 19 Jan 2026 12:02:39 -0500 Subject: [PATCH 1/2] Install Python 3.9 on 6.1 and lower The underlying Windows image has been updated to remove Python 3.9. Swift toolchains version 6.1 and lower require Python 3.9. Install it for these toolchains, and continue to install 3.10 for toolchains > 6.1. --- .github/workflows/swift_package_test.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml index 34012cdd..86e36448 100644 --- a/.github/workflows/swift_package_test.yml +++ b/.github/workflows/swift_package_test.yml @@ -730,11 +730,17 @@ jobs: docker pull $Image echo "image=$Image" >> "$env:GITHUB_OUTPUT" - name: "Install Python 3.10" - if: ${{ !inputs.enable_windows_docker }} + if: ${{ !inputs.enable_windows_docker && !(matrix.swift_version == '6.1' || matrix.swift_version == '6.0' || matrix.swift_version == '5.10' || matrix.swift_version == '5.9') }} uses: actions/setup-python@v6 with: python-version: "3.10" architecture: "x64" + - name: "Install Python 3.9" + if: ${{ !inputs.enable_windows_docker && (matrix.swift_version == '6.1' || matrix.swift_version == '6.0' || matrix.swift_version == '5.10' || matrix.swift_version == '5.9') }} + uses: actions/setup-python@v6 + with: + python-version: "3.9" + architecture: "x64" - name: Install Visual Studio Build Tools if: ${{ !inputs.enable_windows_docker }} run: . ${{ steps.script_path.outputs.root }}/.github/workflows/scripts/windows/install-vsb.ps1 @@ -789,3 +795,4 @@ jobs: timeout-minutes: 60 if: ${{ !inputs.enable_windows_docker }} run: powershell.exe -NoLogo -File $env:TEMP\test-script\run.ps1; exit $LastExitCode + From f9889d282ce77920b8b6f14e44ff912a2e7dc566 Mon Sep 17 00:00:00 2001 From: Paul LeMarquand Date: Mon, 19 Jan 2026 13:34:59 -0500 Subject: [PATCH 2/2] Fixup whitespace lint issue --- .github/workflows/swift_package_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml index 86e36448..8594adfe 100644 --- a/.github/workflows/swift_package_test.yml +++ b/.github/workflows/swift_package_test.yml @@ -795,4 +795,3 @@ jobs: timeout-minutes: 60 if: ${{ !inputs.enable_windows_docker }} run: powershell.exe -NoLogo -File $env:TEMP\test-script\run.ps1; exit $LastExitCode -