Skip to content

Commit ed20023

Browse files
authored
Windows: add a development nightly definition (#377)
Introduce a configuration for the nightly toolchain on Windows. Include a 1809 image for use on the CI systems.
1 parent 92f2edc commit ed20023

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

nightly-main/windows/1809/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
127127
Remove-Item -ErrorAction SilentlyContinue -Force -Recurse ${env:TEMP}\*
128128

129129
# Install Swift toolchain.
130-
ARG SWIFT_RELEASE_METADATA=http://download.swift.org/development/windows10/latest-build.yml
131-
RUN $env:Release = curl.exe -sL ${env:SWIFT_RELEASE_METADATA} | python -c 'import json, sys, yaml; print(json.dumps(yaml.safe_load(sys.stdin.read()), default = str))'; \
130+
ARG SWIFT_RELEASE_METADATA=http://download.swift.org/development/windows10/latest-build.json
131+
RUN $env:Release = curl.exe -sL ${env:SWIFT_RELEASE_METADATA}; \
132132
$env:SWIFT = "https://download.swift.org/development/windows10/$($($env:Release | ConvertFrom-JSON).dir)/$($($env:Release | ConvertFrom-JSON).download)"; \
133133
Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:SWIFT}); \
134134
Invoke-WebRequest -Uri ${env:SWIFT} -OutFile installer.exe; \

nightly-main/windows/LTSC2022/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
127127
Remove-Item -ErrorAction SilentlyContinue -Force -Recurse ${env:TEMP}\*
128128

129129
# Install Swift toolchain.
130-
ARG SWIFT_RELEASE_METADATA=http://download.swift.org/development/windows10/latest-build.yml
131-
RUN $env:Release = curl.exe -sL ${env:SWIFT_RELEASE_METADATA} | python -c 'import json, sys, yaml; print(json.dumps(yaml.safe_load(sys.stdin.read()), default = str))'; \
130+
ARG SWIFT_RELEASE_METADATA=http://download.swift.org/development/windows10/latest-build.json
131+
RUN $env:Release = curl.exe -sL ${env:SWIFT_RELEASE_METADATA}; \
132132
$env:SWIFT = "https://download.swift.org/development/windows10/$($($env:Release | ConvertFrom-JSON).dir)/$($($env:Release | ConvertFrom-JSON).download)"; \
133133
Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:SWIFT}); \
134134
Invoke-WebRequest -Uri ${env:SWIFT} -OutFile installer.exe; \

0 commit comments

Comments
 (0)