diff options
| author | bors <bors@rust-lang.org> | 2022-03-18 22:10:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-18 22:10:55 +0000 |
| commit | 9b701e7eaa08c2b2ef8c6e59b8b33436cb10aa45 (patch) | |
| tree | a8075a4f5622f9bac265c818615d241790a98310 /src/ci/scripts | |
| parent | 1bfe40d11c3630254504fb73eeccfca28d50df52 (diff) | |
| parent | 9c40db22ffd86ddbc185e3dc5f77dd4cb060f0b2 (diff) | |
| download | rust-9b701e7eaa08c2b2ef8c6e59b8b33436cb10aa45.tar.gz rust-9b701e7eaa08c2b2ef8c6e59b8b33436cb10aa45.zip | |
Auto merge of #95090 - matthiaskrgr:rollup-pho6x6s, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #94115 (Let `try_collect` take advantage of `try_fold` overrides) - #94295 (Always evaluate all cfg predicate in all() and any()) - #94848 (Compare installed browser-ui-test version to the one used in CI) - #94993 (Add test for >65535 hashes in lexing raw string) - #95017 (Derive Eq for std::cmp::Ordering, instead of using manual impl.) - #95058 (Add use of bool::then in sys/unix/process) - #95083 (Document that `Option<extern "abi" fn>` discriminant elision applies for any ABI) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/should-skip-this.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh index c046a6c8a26..c863f1b68c7 100755 --- a/src/ci/scripts/should-skip-this.sh +++ b/src/ci/scripts/should-skip-this.sh @@ -26,6 +26,7 @@ if [[ -n "${CI_ONLY_WHEN_SUBMODULES_CHANGED-}" ]]; then src/test/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 \ src/tools/rustdoc-gui); then # There was a change in either rustdoc or in its GUI tests. echo "Rustdoc was updated" |