diff options
| author | wwylele <wwylele@gmail.com> | 2016-09-22 07:39:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-22 07:39:12 +0200 |
| commit | c59bdecd23eb8c62219b5edcea04adaf23cd7430 (patch) | |
| tree | d5fd5ea150f93d4b05b98f4d289339cd9d1f6153 | |
| parent | Merge pull request #2086 from linkmauve/clang-format (diff) | |
| parent | travis: fix clang-format lint (diff) | |
| download | yuzu-c59bdecd23eb8c62219b5edcea04adaf23cd7430.tar yuzu-c59bdecd23eb8c62219b5edcea04adaf23cd7430.tar.gz yuzu-c59bdecd23eb8c62219b5edcea04adaf23cd7430.tar.bz2 yuzu-c59bdecd23eb8c62219b5edcea04adaf23cd7430.tar.lz yuzu-c59bdecd23eb8c62219b5edcea04adaf23cd7430.tar.xz yuzu-c59bdecd23eb8c62219b5edcea04adaf23cd7430.tar.zst yuzu-c59bdecd23eb8c62219b5edcea04adaf23cd7430.zip | |
| -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 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then # Get list of every file modified in this pull request - files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$')" + files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' || true)" else # Check everything for branch pushes files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')" @@ -27,7 +27,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then set +x for f in $files_to_lint; do - d=$(diff -u "$f" <($CLANG_FORMAT "$f")) + d=$(diff -u "$f" <($CLANG_FORMAT "$f") || true) if ! [ -z "$d" ]; then echo "!!! $f not compliant to coding style, here is the fix:" echo "$d" |