Skip to content

Commit

Permalink
Fix an obvious case that I missed in pantsbuild#9524.
Browse files Browse the repository at this point in the history
# Delete this line to force CI to run the JVM tests.
[ci skip-jvm-tests]
# Delete this line to force CI to run Clippy and the Rust tests.
[ci skip-rust-tests]
  • Loading branch information
Stu Hood committed Apr 29, 2020
1 parent fdc0975 commit 132aca3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build-support/githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ MERGE_BASE="$(git_merge_base)"
# fails in pants changed.
if git rev-parse --verify "${MERGE_BASE}" &>/dev/null; then
if git diff "${MERGE_BASE}" --name-only | grep '\.rs$' > /dev/null; then
echo "* Checking formatting of Rust files"
./build-support/bin/check_rust_formatting.sh || exit 1
# Clippy happens on a different Travis CI shard because of separate caching concerns.
# The TRAVIS env var is documented here:
# https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
if [[ "${TRAVIS}" != "true" ]]; then
echo "* Running cargo clippy"
./build-support/bin/check_clippy.sh || exit 1
fi
echo "* Checking formatting of Rust files"
./build-support/bin/check_rust_formatting.sh || exit 1
echo "* Checking Rust target headers"
build-support/bin/check_rust_target_headers.sh || exit 1
fi
Expand Down

0 comments on commit 132aca3

Please sign in to comment.