Skip to content

Commit

Permalink
Auto merge of rust-lang#98423 - ehuss:ci-submodule-no-archive, r=comp…
Browse files Browse the repository at this point in the history
…iler-errors

Temporarily disable submodule archive downloads.

The `llvm-project` `/archive/` download has been timing out with a 504 error since yesterday. This changes it so that it uses a normal submodule clone, but also uses `--depth 1` since GitHub now supports `allowReachableSHA1InWant` which allows for fetching a specific revision. That should be reasonably fast (but not as fast as an archive download) to unstick CI.
  • Loading branch information
bors committed Jun 23, 2022
2 parents 10f4ce3 + ebfde3c commit 4334739
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions src/ci/init_repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ function fetch_github_commit_archive {
rm $cached
}

included="src/llvm-project src/doc/book src/doc/rust-by-example"
# 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=""
modules="$(git config --file .gitmodules --get-regexp '\.path$' | cut -d' ' -f2)"
modules=($modules)
use_git=""
Expand All @@ -71,10 +74,10 @@ for i in ${!modules[@]}; do
done
retry sh -c "git submodule deinit -f $use_git && \
git submodule sync && \
git submodule update -j 16 --init --recursive $use_git"
STATUS=0
for pid in ${bg_pids[*]}
do
wait $pid || STATUS=1
done
exit ${STATUS}
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}

0 comments on commit 4334739

Please sign in to comment.