Skip to content

Commit 326fec2

Browse files
authored
Rollup merge of #84911 - Mark-Simulacrum:retry-clang, r=pietroalbini
Retry clang+llvm download We've been seeing a pretty high rate of spurious network failures (e.g., openssl connection reset by peer). Not clear why, but let's add a retry. r? `@pietroalbini`
2 parents 343a094 + aa68ec2 commit 326fec2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/ci/scripts/install-clang.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ if isMacOS; then
1818
bindir="$(xcode-select --print-path)/Toolchains/XcodeDefault.xctoolchain/usr/bin"
1919
else
2020
file="${MIRRORS_BASE}/clang%2Bllvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz"
21-
curl -f "${file}" | tar xJf -
21+
retry curl -f "${file}" -o "clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz"
22+
tar xJf "clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz"
2223
bindir="$(pwd)/clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin/bin"
2324
fi
2425

@@ -48,7 +49,8 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
4849

4950
mkdir -p citools/clang-rust
5051
cd citools
51-
curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.exe" -o "LLVM-${LLVM_VERSION}-win64.exe"
52+
retry curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.exe" \
53+
-o "LLVM-${LLVM_VERSION}-win64.exe"
5254
7z x -oclang-rust/ "LLVM-${LLVM_VERSION}-win64.exe"
5355
ciCommandSetEnv RUST_CONFIGURE_ARGS \
5456
"${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"

0 commit comments

Comments
 (0)