Only clippy on CI on one shard

pantsbuild · Jan 18, 2019 · a567dcb · a567dcb
1 parent d959881
commit a567dcb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/build-support/bin/pre-commit.sh b/build-support/bin/pre-commit.sh
@@ -17,7 +17,10 @@ echo "* Checking for banned imports" && ./build-support/bin/check_banned_imports
 
 if git diff master --name-only | grep '\.rs$' > /dev/null; then
   echo "* Checking formatting of rust files" && ./build-support/bin/check_rust_formatting.sh || exit 1
-  echo "* Running cargo clippy" && ./build-support/bin/check_clippy.sh || exit 1
+  # Clippy happens on a different shard because of separate caching concerns.
+  if [[ "${RUNNING_ON_TRAVIS}" != "1" ]]; then
+    echo "* Running cargo clippy" && ./build-support/bin/check_clippy.sh || exit 1
+  fi
   echo "* Checking rust target headers" && build-support/bin/check_rust_target_headers.sh || exit 1
 fi
 

diff --git a/build-support/bin/travis-ci.sh b/build-support/bin/travis-ci.sh
@@ -9,6 +9,8 @@ set -euo pipefail
 
 cd "$(git rev-parse --show-toplevel)"
 
+export RUNNING_ON_TRAVIS=1
+
 PYENV="$(which pyenv 2>/dev/null)"
 PYENV_ROOT="$(pyenv root 2>/dev/null || true)"