Merge branch 'swiftlang:main' into main

Author: marcprux

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 '✓';                                                             \

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 '✓';                                                             \

swift-ci/README.md

@@ -6,7 +6,7 @@ The Continuous Integration system uses the Dockerfiles in this directory to defi
 
 ## Directory Structure
 
-The Dockerfiles used for Continuous Integration are layed out under the top level `swift-ci` directory. Under that, we have a directory for each of the target branches, e.g. Continuous Integration for Swift's `main` branch uses the `swift-ci/master` Dockerfiles.
+The Dockerfiles used for Continuous Integration are laid out under the top level `swift-ci` directory. Under that, we have a directory for each of the target branches, e.g. Continuous Integration for Swift's `main` branch uses the `swift-ci/master` Dockerfiles.
 
 There is also a specific directory (`swift-docc-render`) for the Dockerfile used to build Swift-DocC-Render. Swift-DocC-Render builds separately from the rest of the projects in the Swift toolchain and ships a pre-built copy for use in the toolchain in the Swift-DocC-Render-Artifact repository.