diff options
| author | bors <bors@rust-lang.org> | 2022-10-13 03:33:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-13 03:33:40 +0000 |
| commit | 3cf5fc58d56adeee42abb7e5059c718b0a86857d (patch) | |
| tree | 82819af2de9e0f2863eb6ead3756f3350b81d351 /src/ci/scripts | |
| parent | 2a9217601c0e5ae83fa8bca6797137a6d2f7e4e5 (diff) | |
| parent | e8029368d3ccba813cd1ed56a7cf5c0ab124f2f0 (diff) | |
| download | rust-3cf5fc58d56adeee42abb7e5059c718b0a86857d.tar.gz rust-3cf5fc58d56adeee42abb7e5059c718b0a86857d.zip | |
Auto merge of #102995 - JohnTitor:rollup-yomkwge, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #102641 (Support casting boxes to dyn*) - #102836 (rustc_target: Fix json target specs using LLD linker flavors in link args) - #102949 (should-skip-this: add missing backslash) - #102967 (Add test for issue 102964) - #102971 (tidy: error if a lang feature is already present) - #102974 (Fix small word dupe typos) - #102980 (rustdoc: merge separate `.item-info` CSS) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/should-skip-this.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh index 60c2960b160..a8a1899317f 100755 --- a/src/ci/scripts/should-skip-this.sh +++ b/src/ci/scripts/should-skip-this.sh @@ -19,7 +19,7 @@ if [[ -n "${CI_ONLY_WHEN_SUBMODULES_CHANGED-}" ]]; then # those files are present in the diff a submodule was updated. echo "Submodules were updated" elif ! (git diff --quiet "$BASE_COMMIT" -- \ - src/tools/clippy src/tools/rustfmt src/tools/miri + src/tools/clippy src/tools/rustfmt src/tools/miri \ library/std/src/sys); then # There is not an easy blanket search for subtrees. For now, manually list # the subtrees. |