Skip to content

Commit

Permalink
[CodeStyle] fix cpplint hook not working on CI (#46136)
Browse files Browse the repository at this point in the history
* update cpplint hook script

* update pre-commit config

* try trigger cpplint on ci

* Revert "try trigger cpplint on ci"

This reverts commit 8958534.

* empty commit, test=document_fix
  • Loading branch information
SigureMo authored Sep 19, 2022
1 parent 12c1744 commit 9d0d4a1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 23 deletions.
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ repos:
entry: bash ./tools/codestyle/cpplint_pre_commit.hook
language: system
files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx)$
args:
- --extensions=c,cc,cxx,cpp,cu,cuh,h,hpp,hxx,kps
- --filter=-readability/fn_size,-build/include_what_you_use,-build/c++11,-whitespace/parens
- --quiet
- repo: local
hooks:
- id: pylint-doc-string
Expand Down
25 changes: 2 additions & 23 deletions tools/codestyle/cpplint_pre_commit.hook
Original file line number Diff line number Diff line change
@@ -1,32 +1,11 @@
#!/bin/bash

TOTAL_ERRORS=0

readonly VERSION="1.6.0"

version=$(cpplint --version)

if [[ ! $TRAVIS_BRANCH ]]; then
# install cpplint on local machine.
if ! [[ $version == *"$VERSION"* ]]; then
if ! [[ $version == *"$VERSION"* ]]; then
pip install cpplint==1.6.0
fi
# diff files on local machine.
files=$(git diff --cached --name-status | awk '$1 != "D" {print $2}')
else
# diff files between PR and latest commit on Travis CI.
branch_ref=$(git rev-parse "$TRAVIS_BRANCH")
head_ref=$(git rev-parse HEAD)
files=$(git diff --name-status $branch_ref $head_ref | awk '$1 != "D" {print $2}')
fi
# The trick to remove deleted files: https://stackoverflow.com/a/2413151
for file in $files; do
if [[ $file =~ ^(patches/.*) ]]; then
continue;
else
cpplint --filter=-readability/fn_size,-build/include_what_you_use,-build/c++11,-whitespace/parens $file;
TOTAL_ERRORS=$(expr $TOTAL_ERRORS + $?);
fi
done

exit $TOTAL_ERRORS
cpplint $@

0 comments on commit 9d0d4a1

Please sign in to comment.