diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-05-07 15:20:28 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 15:20:28 +0900 |
| commit | 326fec27a6e7df3947e7b62bec43ab86b776ea9d (patch) | |
| tree | 25563ed768c4ede5ff06b3eac03ec95984bbaf10 /src/ci/scripts | |
| parent | 343a094aa1ad890b65cfca8a11a289b5d3f429ac (diff) | |
| parent | aa68ec2f81c6382c232f485fffe3aeb3e2e109f8 (diff) | |
| download | rust-326fec27a6e7df3947e7b62bec43ab86b776ea9d.tar.gz rust-326fec27a6e7df3947e7b62bec43ab86b776ea9d.zip | |
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`
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-clang.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh index 8a30acc2e46..7b540b5c6e9 100755 --- a/src/ci/scripts/install-clang.sh +++ b/src/ci/scripts/install-clang.sh @@ -18,7 +18,8 @@ if isMacOS; then bindir="$(xcode-select --print-path)/Toolchains/XcodeDefault.xctoolchain/usr/bin" else file="${MIRRORS_BASE}/clang%2Bllvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz" - curl -f "${file}" | tar xJf - + retry curl -f "${file}" -o "clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz" + tar xJf "clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz" bindir="$(pwd)/clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin/bin" fi @@ -48,7 +49,8 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then mkdir -p citools/clang-rust cd citools - curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.exe" -o "LLVM-${LLVM_VERSION}-win64.exe" + retry curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.exe" \ + -o "LLVM-${LLVM_VERSION}-win64.exe" 7z x -oclang-rust/ "LLVM-${LLVM_VERSION}-win64.exe" ciCommandSetEnv RUST_CONFIGURE_ARGS \ "${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe" |