Skip to content

Commit db10f68

Browse files
marcpruxmarcprux
authored
Merge branch 'swiftlang:main' into main
2 parents 31f00b1 + 9088873 commit db10f68

File tree

67 files changed

+245
-152
lines changed

Some content is hidden

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

67 files changed

+245
-152
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 = \

‎ci_test.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ def main():
9696
'-t', image_name,
9797
docker_dir
9898
]
99+
clean_command = f"docker buildx prune -af"
100+
else:
101+
clean_command = f"docker image rm {image_name}"
99102

100103
status = run_command(cmd, log_file=log_file)
101104
results[dockerfile] = status
@@ -111,7 +114,7 @@ def main():
111114
run_command(cmd)
112115
print("[{}] - {}".format(results[dockerfile], dockerfile))
113116
sys.stdout.flush()
114-
run_command(f"docker image rm {image_name}")
117+
run_command(clean_command)
115118
run_command("docker image prune -f")
116119

117120
for dockerfile in dockerfiles:

‎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 = \

0 commit comments

Comments
 (0)