From 56fa9b43c8a9d749c7e7e299d7ba85d377e27b94 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Wed, 5 May 2021 19:13:38 -0400 Subject: Run toolstate jobs when src/tools/rustfmt is modified. Previously, this would be caught by a change for modified submodules; now that rustfmt is no longer a submodule, the check needs to be explicit. --- src/ci/scripts/should-skip-this.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ci/scripts') diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh index 36bf4368990..03fad62d331 100755 --- a/src/ci/scripts/should-skip-this.sh +++ b/src/ci/scripts/should-skip-this.sh @@ -14,10 +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 +elif git diff --name-only HEAD^ | grep --quiet src/tools/'\(clippy\|rustfmt\)'; then # There is not an easy blanket search for subtrees. For now, manually list # clippy. - echo "Executing the job since clippy subtree was updated" + echo "Executing the job since clippy or rustfmt subtree was updated" else echo "Not executing this job since no submodules were updated" ciCommandSetEnv SKIP_JOB 1 -- cgit 1.4.1-3-g733a5