From 4c89cf057c70f324f18265b00e3a320fdff6b5a6 Mon Sep 17 00:00:00 2001 From: Owen Voorhees Date: Fri, 20 Jun 2025 10:12:29 -0700 Subject: [PATCH] Revert "Pin Windows images to the 6/9 nightly main snapshot (#478)" This reverts commit 6cbe96350acba2036ecc8ebb96fd300363d0e02d. --- nightly-main/windows/1809/Dockerfile | 4 +--- nightly-main/windows/LTSC2022/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nightly-main/windows/1809/Dockerfile b/nightly-main/windows/1809/Dockerfile index 3dfab4e9..5ef600bf 100644 --- a/nightly-main/windows/1809/Dockerfile +++ b/nightly-main/windows/1809/Dockerfile @@ -128,10 +128,8 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB}); # Install Swift toolchain. ARG SWIFT_RELEASE_METADATA=https://download.swift.org/development/windows10/latest-build.json -# Pinned to 6/9 snapshot due to https://github.com/swiftlang/swift/issues/82281 -# $SWIFT_URL = "\"https://download.swift.org/development/windows10/$($Release.dir)/$($Release.download)\""; \ RUN $Release = curl.exe -sL ${env:SWIFT_RELEASE_METADATA} | ConvertFrom-JSON; \ - $SWIFT_URL = "\"https://download.swift.org/development/windows10/swift-DEVELOPMENT-SNAPSHOT-2025-06-09-a/swift-DEVELOPMENT-SNAPSHOT-2025-06-09-a-windows10.exe\""; \ + $SWIFT_URL = "\"https://download.swift.org/development/windows10/$($Release.dir)/$($Release.download)\""; \ Write-Host -NoNewLine ('Downloading {0} ... ' -f ${SWIFT_URL}); \ Invoke-WebRequest -Uri ${SWIFT_URL} -OutFile installer.exe; \ Write-Host '✓'; \ diff --git a/nightly-main/windows/LTSC2022/Dockerfile b/nightly-main/windows/LTSC2022/Dockerfile index 7b8f6d55..b1af4a39 100644 --- a/nightly-main/windows/LTSC2022/Dockerfile +++ b/nightly-main/windows/LTSC2022/Dockerfile @@ -128,10 +128,8 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB}); # Install Swift toolchain. ARG SWIFT_RELEASE_METADATA=https://download.swift.org/development/windows10/latest-build.json -# Pinned to 6/9 snapshot due to https://github.com/swiftlang/swift/issues/82281 -# $SWIFT_URL = "\"https://download.swift.org/development/windows10/$($Release.dir)/$($Release.download)\""; \ RUN $Release = curl.exe -sL ${env:SWIFT_RELEASE_METADATA} | ConvertFrom-JSON; \ - $SWIFT_URL = "\"https://download.swift.org/development/windows10/swift-DEVELOPMENT-SNAPSHOT-2025-06-09-a/swift-DEVELOPMENT-SNAPSHOT-2025-06-09-a-windows10.exe\""; \ + $SWIFT_URL = "\"https://download.swift.org/development/windows10/$($Release.dir)/$($Release.download)\""; \ Write-Host -NoNewLine ('Downloading {0} ... ' -f ${SWIFT_URL}); \ Invoke-WebRequest -Uri ${SWIFT_URL} -OutFile installer.exe; \ Write-Host '✓'; \