Skip to content

Commit 87dd56f

Browse files
authored
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.
2 parents f6ea143 + cefaa9f commit 87dd56f

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/ci/scripts/checkout-submodules.sh

+7-10
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ function fetch_github_commit_archive {
3636
rm $cached
3737
}
3838

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

0 commit comments

Comments
 (0)