From 2c373fa3be8a8a7d216842156e796af71f379784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= Date: Tue, 25 Feb 2025 10:49:43 +0100 Subject: [PATCH] Apply #442 to the Dockerfile that runs in CI --- nightly-main/windows/1809/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nightly-main/windows/1809/Dockerfile b/nightly-main/windows/1809/Dockerfile index 17b3deef..62196aa0 100644 --- a/nightly-main/windows/1809/Dockerfile +++ b/nightly-main/windows/1809/Dockerfile @@ -127,11 +127,11 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB}); Remove-Item -ErrorAction SilentlyContinue -Force -Recurse ${env:TEMP}\* # Install Swift toolchain. -ARG SWIFT_RELEASE_METADATA=http://download.swift.org/development/windows10/latest-build.json -RUN $env:Release = curl.exe -sL ${env:SWIFT_RELEASE_METADATA}; \ - $env:SWIFT_URL = "\"https://download.swift.org/development/windows10/$($($env:Release | ConvertFrom-JSON).dir)/$($($env:Release | ConvertFrom-JSON).download)\""; \ - Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:SWIFT_URL}); \ - Invoke-WebRequest -Uri ${env:SWIFT_URL} -OutFile installer.exe; \ +ARG SWIFT_RELEASE_METADATA=https://download.swift.org/development/windows10/latest-build.json +RUN $Release = curl.exe -sL ${env:SWIFT_RELEASE_METADATA} | ConvertFrom-JSON; \ + $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 '✓'; \ Write-Host -NoNewLine 'Installing Swift ... '; \ $Process = \