diff options
| author | 2016-09-22 11:02:14 +0800 | |
|---|---|---|
| committer | 2016-09-22 13:15:38 +0800 | |
| commit | 6e5e5be736c75ff4755ea6cf98f398aba9238c79 (patch) | |
| tree | d5fd5ea150f93d4b05b98f4d289339cd9d1f6153 | |
| parent | Merge pull request #2086 from linkmauve/clang-format (diff) | |
| download | yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.tar.gz yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.tar.xz yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.zip | |
travis: fix clang-format lint
| -rwxr-xr-x | .travis-build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index b8562cb02..3310bacc5 100755 --- a/.travis-build.sh +++ b/.travis-build.sh | |||
| @@ -17,7 +17,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then | |||
| 17 | 17 | ||
| 18 | if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then | 18 | if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then |
| 19 | # Get list of every file modified in this pull request | 19 | # Get list of every file modified in this pull request |
| 20 | files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$')" | 20 | files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' || true)" |
| 21 | else | 21 | else |
| 22 | # Check everything for branch pushes | 22 | # Check everything for branch pushes |
| 23 | files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')" | 23 | files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')" |
| @@ -27,7 +27,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then | |||
| 27 | set +x | 27 | set +x |
| 28 | 28 | ||
| 29 | for f in $files_to_lint; do | 29 | for f in $files_to_lint; do |
| 30 | d=$(diff -u "$f" <($CLANG_FORMAT "$f")) | 30 | d=$(diff -u "$f" <($CLANG_FORMAT "$f") || true) |
| 31 | if ! [ -z "$d" ]; then | 31 | if ! [ -z "$d" ]; then |
| 32 | echo "!!! $f not compliant to coding style, here is the fix:" | 32 | echo "!!! $f not compliant to coding style, here is the fix:" |
| 33 | echo "$d" | 33 | echo "$d" |