summaryrefslogtreecommitdiffstats
path: root/.travis-build.sh
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2016-09-22 05:02:14 +0200
committerwwylele <wwylele@gmail.com>2016-09-22 07:15:38 +0200
commit6e5e5be736c75ff4755ea6cf98f398aba9238c79 (patch)
treed5fd5ea150f93d4b05b98f4d289339cd9d1f6153 /.travis-build.sh
parentMerge pull request #2086 from linkmauve/clang-format (diff)
downloadyuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.tar
yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.tar.gz
yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.tar.bz2
yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.tar.lz
yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.tar.xz
yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.tar.zst
yuzu-6e5e5be736c75ff4755ea6cf98f398aba9238c79.zip
Diffstat (limited to '')
-rwxr-xr-x.travis-build.sh4
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"