Skip to content

Commit a6bcb46

Browse files
justice-adams-applejustice-adams-apple
authored
Merge branch 'swiftlang:main' into fix-debian-and-fedora-user
2 parents af7e7bf + 12587cc commit a6bcb46

File tree

63 files changed

+244
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+244
-74
lines changed

‎5.10/windows/1809/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
100100
Write-Host '✓'; \
101101
} else { \
102102
Write-Host ('✘ ({0})' -f $Hash.Hash); \
103+
exit 1; \
103104
} \
104105
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
105106
$Process = \

‎5.10/windows/LTSC2022/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
100100
Write-Host '✓'; \
101101
} else { \
102102
Write-Host ('✘ ({0})' -f $Hash.Hash); \
103+
exit 1; \
103104
} \
104105
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
105106
$Process = \

‎5.9/windows/LTSC2022/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
100100
Write-Host '✓'; \
101101
} else { \
102102
Write-Host ('✘ ({0})' -f $Hash.Hash); \
103+
exit 1; \
103104
} \
104105
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
105106
$Process = \

‎6.0/windows/1809/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
100100
Write-Host '✓'; \
101101
} else { \
102102
Write-Host ('✘ ({0})' -f $Hash.Hash); \
103+
exit 1; \
103104
} \
104105
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
105106
$Process = \

‎6.0/windows/LTSC2022/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
100100
Write-Host '✓'; \
101101
} else { \
102102
Write-Host ('✘ ({0})' -f $Hash.Hash); \
103+
exit 1; \
103104
} \
104105
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
105106
$Process = \

‎6.1/windows/1809/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
100100
Write-Host '✓'; \
101101
} else { \
102102
Write-Host ('✘ ({0})' -f $Hash.Hash); \
103+
exit 1; \
103104
} \
104105
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
105106
$Process = \

‎6.1/windows/LTSC2022/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
100100
Write-Host '✓'; \
101101
} else { \
102102
Write-Host ('✘ ({0})' -f $Hash.Hash); \
103+
exit 1; \
103104
} \
104105
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
105106
$Process = \

‎nightly-6.0/windows/1809/Dockerfile

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

9797
# Install Visual Studio Build Tools
98-
ARG VSB=https://aka.ms/vs/17/release/vs_buildtools.exe
99-
ARG VSB_SHA256=15A2A6591B1E91B63E9909864FCBC68459EB26124B814618947215F754CD9CEE
98+
ARG VSB=https://download.visualstudio.microsoft.com/download/pr/ae7ac791-9759-4076-bba7-47ff510c57af/a783199025439d65f310bff041e278b966a6dbed8dbcd7fc96b55389f574ef41/vs_BuildTools.exe
99+
ARG VSB_SHA256=A783199025439D65F310BFF041E278B966A6DBED8DBCD7FC96B55389F574EF41
100100
RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB}); \
101101
Invoke-WebRequest -Uri ${env:VSB} -OutFile vs_buildtools.exe; \
102102
Write-Host '✓'; \
@@ -106,6 +106,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
106106
Write-Host '✓'; \
107107
} else { \
108108
Write-Host ('✘ ({0})' -f $Hash.Hash); \
109+
exit 1; \
109110
} \
110111
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
111112
$Process = \

‎nightly-6.0/windows/LTSC2022/Dockerfile

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

9797
# Install Visual Studio Build Tools
98-
ARG VSB=https://aka.ms/vs/17/release/vs_buildtools.exe
99-
ARG VSB_SHA256=15A2A6591B1E91B63E9909864FCBC68459EB26124B814618947215F754CD9CEE
98+
ARG VSB=https://download.visualstudio.microsoft.com/download/pr/ae7ac791-9759-4076-bba7-47ff510c57af/a783199025439d65f310bff041e278b966a6dbed8dbcd7fc96b55389f574ef41/vs_BuildTools.exe
99+
ARG VSB_SHA256=A783199025439D65F310BFF041E278B966A6DBED8DBCD7FC96B55389F574EF41
100100
RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB}); \
101101
Invoke-WebRequest -Uri ${env:VSB} -OutFile vs_buildtools.exe; \
102102
Write-Host '✓'; \
@@ -106,6 +106,7 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
106106
Write-Host '✓'; \
107107
} else { \
108108
Write-Host ('✘ ({0})' -f $Hash.Hash); \
109+
exit 1; \
109110
} \
110111
Write-Host -NoNewLine 'Installing Visual Studio Build Tools ... '; \
111112
$Process = \

‎nightly-6.1/centos/7/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN set -e; \
3131
&& export GNUPGHOME="$(mktemp -d)" \
3232
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
3333
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
34-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
34+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
3535
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
3636
# - Unpack the toolchain, set libs permissions, and clean up.
3737
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

0 commit comments

Comments
 (0)