diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-08-04 22:25:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 22:25:00 +0200 |
| commit | 87dd56f3d6546aba58c231d59cfc7c196e25b224 (patch) | |
| tree | 72b0a078cfa4d2f0f31d4d3a2a633666f373d71f /src/ci/scripts | |
| parent | f6ea143f939934e2c3a6068feff4bd066cc19ff4 (diff) | |
| parent | cefaa9faafa961dc3054f0678ea7e3096066f58b (diff) | |
| download | rust-87dd56f3d6546aba58c231d59cfc7c196e25b224.tar.gz rust-87dd56f3d6546aba58c231d59cfc7c196e25b224.zip | |
Rollup merge of #99772 - ehuss:reenable-submodule-archive, r=Mark-Simulacrum
Re-enable submodule archive downloads. This is effectively a revert of #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.
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/checkout-submodules.sh | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/ci/scripts/checkout-submodules.sh b/src/ci/scripts/checkout-submodules.sh index 3eb4b8f9058..f6cb8f8a6da 100755 --- a/src/ci/scripts/checkout-submodules.sh +++ b/src/ci/scripts/checkout-submodules.sh @@ -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="" @@ -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} |
