Fix Travis clang-format check

This commit is contained in:
Yuri Kunde Schlesner 2016-09-21 00:31:29 -07:00
parent f120e78b56
commit 0e3f0120a8
2 changed files with 32 additions and 16 deletions

View file

@ -9,23 +9,37 @@ if grep -nr '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis*
exit 1 exit 1
fi fi
for f in $(git diff --name-only --diff-filter=ACMRTUXB --cached); do # Only run clang-format on Linux because we don't have 4.0 on OS X images
if ! echo "$f" | egrep -q "[.](cpp|h)$"; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then
continue # Default clang-format points to default 3.5 version one
CLANG_FORMAT=clang-format-4.0
$CLANG_FORMAT --version
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\)$')"
else
# Check everything for branch pushes
files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
fi fi
if ! echo "$f" | egrep -q "^src/"; then
continue # Turn off tracing for this because it's too verbose
fi set +x
d=$(diff -u "$f" <(clang-format "$f"))
for f in $files_to_lint; do
d=$(diff -u "$f" <($CLANG_FORMAT "$f"))
if ! [ -z "$d" ]; then if ! [ -z "$d" ]; then
echo "!!! $f not compliant to coding style, here is the fix:" echo "!!! $f not compliant to coding style, here is the fix:"
echo "$d" echo "$d"
fail=1 fail=1
fi fi
done done
if [ "$fail" = 1 ]; then set -x
if [ "$fail" = 1 ]; then
exit 1 exit 1
fi
fi fi
#if OS is linux or is not set #if OS is linux or is not set

View file

@ -17,6 +17,7 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise
packages: packages:
- gcc-6 - gcc-6
- g++-6 - g++-6
@ -25,6 +26,7 @@ addons:
- xorg-dev - xorg-dev
- lib32stdc++6 # For CMake - lib32stdc++6 # For CMake
- lftp # To upload builds - lftp # To upload builds
- clang-format-4.0
cache: cache:
directories: directories: