Skip to content

Commit

Permalink
Rollup merge of rust-lang#99772 - ehuss:reenable-submodule-archive, r…
Browse files Browse the repository at this point in the history
…=Mark-Simulacrum

Re-enable submodule archive downloads.

This is effectively a revert of rust-lang#98423 (though it keeps the `--depth 1` flag since that is still helpful).

GitHub has indicated that they have been working on the original issue, and my testing shows that the llvm-project archive download now succeeds 100% of the time.

This should save about a minute on every job.
  • Loading branch information
matthiaskrgr committed Aug 4, 2022
2 parents f6ea143 + cefaa9f commit 87dd56f
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions src/ci/scripts/checkout-submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ function fetch_github_commit_archive {
rm $cached
}

# Archive downloads are temporarily disabled due to sudden 504
# gateway timeout errors.
# included="src/llvm-project src/doc/book src/doc/rust-by-example"
included=""
included="src/llvm-project src/doc/book src/doc/rust-by-example"
modules="$(git config --file .gitmodules --get-regexp '\.path$' | cut -d' ' -f2)"
modules=($modules)
use_git=""
Expand All @@ -63,9 +60,9 @@ done
retry sh -c "git submodule deinit -f $use_git && \
git submodule sync && \
git submodule update -j 16 --init --recursive --depth 1 $use_git"
# STATUS=0
# for pid in ${bg_pids[*]}
# do
# wait $pid || STATUS=1
# done
# exit ${STATUS}
STATUS=0
for pid in ${bg_pids[*]}
do
wait $pid || STATUS=1
done
exit ${STATUS}

0 comments on commit 87dd56f

Please sign in to comment.