diff options
| author | bors <bors@rust-lang.org> | 2023-01-13 13:11:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-13 13:11:11 +0000 |
| commit | cd952c8c694c28b9bb95a5d98c90186381e225c2 (patch) | |
| tree | 7ecd84a4f5c11bae743e22efaff4617a4197a7f6 /src/ci/scripts | |
| parent | cb1592518e09098c19d90b4f4f0a8f0373cc1bd5 (diff) | |
| parent | 4aa07c921abafcc43fc9d545d8ec86b80103ec4e (diff) | |
| download | rust-cd952c8c694c28b9bb95a5d98c90186381e225c2.tar.gz rust-cd952c8c694c28b9bb95a5d98c90186381e225c2.zip | |
Auto merge of #2756 - RalfJung:rustup, r=RalfJung
Rustup
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/checkout-submodules.sh | 15 | ||||
| -rwxr-xr-x | src/ci/scripts/should-skip-this.sh | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/ci/scripts/checkout-submodules.sh b/src/ci/scripts/checkout-submodules.sh index f6cb8f8a6da..5bb343241ae 100755 --- a/src/ci/scripts/checkout-submodules.sh +++ b/src/ci/scripts/checkout-submodules.sh @@ -36,7 +36,8 @@ function fetch_github_commit_archive { rm $cached } -included="src/llvm-project src/doc/book src/doc/rust-by-example" +#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="" @@ -60,9 +61,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} diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh index a8a1899317f..85d77225380 100755 --- a/src/ci/scripts/should-skip-this.sh +++ b/src/ci/scripts/should-skip-this.sh @@ -27,7 +27,7 @@ if [[ -n "${CI_ONLY_WHEN_SUBMODULES_CHANGED-}" ]]; then # that breaks Miri. echo "Tool subtrees were updated" elif ! (git diff --quiet "$BASE_COMMIT" -- \ - src/test/rustdoc-gui \ + tests/rustdoc-gui \ src/librustdoc \ src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile \ src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version \ |