Skip to content

Commit

Permalink
Only clippy on CI on one shard
Browse files Browse the repository at this point in the history
  • Loading branch information
illicitonion committed Jan 18, 2019
1 parent d959881 commit a567dcb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion build-support/bin/pre-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions build-support/bin/travis-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down

0 comments on commit a567dcb

Please sign in to comment.