about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-07-06 19:56:55 +0000
committerbors <bors@rust-lang.org>2017-07-06 19:56:55 +0000
commit696412de7e4e119f8536686c643621115b90c775 (patch)
tree0f246ab2cce8da0a9a9b702a025c5c55cab628fd
parentcd72f2e269357ea4da4d0cf5502af35f4f9dab9e (diff)
parent7c8523e87bfc9eb3b2f84e076d263b621f0cf016 (diff)
downloadrust-696412de7e4e119f8536686c643621115b90c775.tar.gz
rust-696412de7e4e119f8536686c643621115b90c775.zip
Auto merge of #43092 - aidanhs:aphs-retry-llvm-tarball, r=alexcrichton
Retry downloading llvm commit tarball

As promised on https://github.com/rust-lang/rust/pull/42816#issuecomment-312890169

r? @alexcrichton
-rwxr-xr-xsrc/ci/init_repo.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/init_repo.sh b/src/ci/init_repo.sh
index f8e86986f82..7ffe00a807b 100755
--- a/src/ci/init_repo.sh
+++ b/src/ci/init_repo.sh
@@ -61,7 +61,8 @@ for module in $modules; do
     if [ "$module" = src/llvm ]; then
         commit="$(git ls-tree HEAD src/llvm | awk '{print $3}')"
         git rm src/llvm
-        curl -sSL -O "https://github.com/rust-lang/llvm/archive/$commit.tar.gz"
+        retry sh -c "rm -f $commit.tar.gz && \
+            curl -sSL -O https://github.com/rust-lang/llvm/archive/$commit.tar.gz"
         tar -C src/ -xf "$commit.tar.gz"
         rm "$commit.tar.gz"
         mv "src/llvm-$commit" src/llvm