diff options
| author | bors <bors@rust-lang.org> | 2020-11-10 10:43:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-10 10:43:14 +0000 |
| commit | cf9cf7c923eb01146971429044f216a3ca905e06 (patch) | |
| tree | 3c062e157444df6991fc582cf36b48a8d83b7e2a /src/ci/scripts | |
| parent | 25f6938da459a57b43bdf16ed6bdad3225b2a3ce (diff) | |
| parent | c150b933ac73a7a1102f1ee934e8f94bfe73be63 (diff) | |
| download | rust-cf9cf7c923eb01146971429044f216a3ca905e06.tar.gz rust-cf9cf7c923eb01146971429044f216a3ca905e06.zip | |
Auto merge of #78904 - Dylan-DPC:rollup-8d2w3vu, r=Dylan-DPC
Rollup of 12 pull requests Successful merges: - #74754 (Add `#[cfg(panic = '...')]`) - #76468 (Improve lifetime name annotations for closures & async functions) - #77016 (Test clippy on PR CI on changes) - #78480 (BTreeMap: fix pointer provenance rules) - #78502 (Update Chalk to 0.36.0) - #78513 (Infer the default host target from the host toolchain if possible) - #78566 (Enable LLVM Polly via llvm-args.) - #78580 (inliner: Break inlining cycles) - #78710 (rustc_ast: Do not panic by default when visiting macro calls) - #78746 (Demote i686-unknown-freebsd to tier 2 compiler target) - #78830 (fix `super_visit_with` for `Terminator`) - #78844 (Monomorphize a type argument of size-of operation during codegen) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/should-skip-this.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh index f945db0ada2..36bf4368990 100755 --- a/src/ci/scripts/should-skip-this.sh +++ b/src/ci/scripts/should-skip-this.sh @@ -14,6 +14,10 @@ elif git diff HEAD^ | grep --quiet "^index .* 160000"; then # Submodules pseudo-files inside git have the 160000 permissions, so when # those files are present in the diff a submodule was updated. echo "Executing the job since submodules are updated" +elif git diff --name-only HEAD^ | grep --quiet src/tools/clippy; then + # There is not an easy blanket search for subtrees. For now, manually list + # clippy. + echo "Executing the job since clippy subtree was updated" else echo "Not executing this job since no submodules were updated" ciCommandSetEnv SKIP_JOB 1 |
