Rollup merge of #61420 - felixrabe:patch-2, r=dtolnay

[rust.git] / src / ci / init_repo.sh

diff --git a/src/ci/init_repo.sh b/src/ci/init_repo.sh
index 6de433fd4c2da9d344f74d41badc53b7f3cc6c0b..8b635810825f176d18cb5853c649556ea41e0cdc 100755 (executable)
--- a/src/ci/init_repo.sh
+++ b/src/ci/init_repo.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+# FIXME(61301): we need to debug spurious failures with this on Windows on
+# Azure, so let's print more information in the logs.
+set -x
+
 set -o errexit
 set -o pipefail
 set -o nounset
@@ -34,11 +38,12 @@ if grep -q RUST_RELEASE_CHANNEL=beta src/ci/run.sh; then
   git fetch origin --unshallow beta master
 fi
 
-function fetch_submodule {
+# Duplicated in docker/dist-various-2/shared.sh
+function fetch_github_commit_archive {
     local module=$1
     local cached="download-${module//\//-}.tar.gz"
     retry sh -c "rm -f $cached && \
-        curl -sSL -o $cached $2"
+        curl -f -sSL -o $cached $2"
     mkdir $module
     touch "$module/.git"
     tar -C $module --strip-components=1 -xf $cached
@@ -58,7 +63,7 @@ for i in ${!modules[@]}; do
         git rm $module
         url=${urls[$i]}
         url=${url/\.git/}
-        fetch_submodule $module "$url/archive/$commit.tar.gz" &
+        fetch_github_commit_archive $module "$url/archive/$commit.tar.gz" &
         continue
     else
         use_git="$use_git $module"