diff options
| author | Joshua Nelson <jyn514@gmail.com> | 2021-05-05 19:13:38 -0400 |
|---|---|---|
| committer | Caleb Cartwright <caleb.cartwright@outlook.com> | 2021-05-14 21:54:53 -0500 |
| commit | 56fa9b43c8a9d749c7e7e299d7ba85d377e27b94 (patch) | |
| tree | 6d251cad3f8449593c1c38fec2a4548342a4137f | |
| parent | 079d1c403feb03ce48191bccbb17143faea17bb8 (diff) | |
| download | rust-56fa9b43c8a9d749c7e7e299d7ba85d377e27b94.tar.gz rust-56fa9b43c8a9d749c7e7e299d7ba85d377e27b94.zip | |
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.
| -rwxr-xr-x | src/ci/scripts/should-skip-this.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |