about summary refs log tree commit diff
path: root/src/ci/scripts
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2021-05-12 00:20:08 +0200
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2021-05-26 10:38:08 +0200
commit52f795b772efbfdcb1cb7ba9275333fc4804db88 (patch)
tree22c219968f284af262f90f9fac898dce23d3d441 /src/ci/scripts
parent3994406eca352f3545f5d50272c06c650295b6c2 (diff)
downloadrust-52f795b772efbfdcb1cb7ba9275333fc4804db88.tar.gz
rust-52f795b772efbfdcb1cb7ba9275333fc4804db88.zip
Also run check in case there are changes in the rustdoc-gui tools
Diffstat (limited to 'src/ci/scripts')
-rwxr-xr-xsrc/ci/scripts/should-skip-this.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh
index 469f234e410..fa738fe70c8 100755
--- a/src/ci/scripts/should-skip-this.sh
+++ b/src/ci/scripts/should-skip-this.sh
@@ -26,8 +26,10 @@ elif ! git diff --quiet "$BASE_COMMIT" -- src/tools/clippy src/tools/rustfmt; th
     # There is not an easy blanket search for subtrees. For now, manually list
     # the subtrees.
     echo "Executing the job since clippy or rustfmt subtree was updated"
-elif (git diff --name-only HEAD^ | grep --quiet src/test/rustdoc-gui) || \
-     (git diff --name-only HEAD^ | grep --quiet src/librustdoc); then
+elif ! (git diff --quiet "$BASE_COMMIT" -- \
+         src/test/rustdoc-gui \
+         src/librustdoc \
+         src/tools/rustdoc-gui); then
     # There was a change in either rustdoc or in its GUI tests.
     echo "Executing the job since rustdoc was updated"
 else