From b1503b202043a577720e28969b74cca6f9c954f8 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Mon, 25 May 2015 20:34:09 +0200 Subject: Remove every trailing whitespace from the project (but externals). --- .travis-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis-build.sh') diff --git a/.travis-build.sh b/.travis-build.sh index 21582c68..1028a157 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -6,7 +6,7 @@ set -x #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then mkdir build && cd build - cmake -DUSE_QT5=OFF .. + cmake -DUSE_QT5=OFF .. make -j4 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then export Qt5_DIR=$(brew --prefix)/opt/qt5 -- cgit v1.2.3 From cd03abe08bbcff7b971054c77c0e1459efe1572c Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Mon, 25 May 2015 20:28:17 +0200 Subject: Travis: Add a check for trailing whitespace before any actual compilation. --- .travis-build.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '.travis-build.sh') diff --git a/.travis-build.sh b/.travis-build.sh index 1028a157..14dfd64d 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -3,6 +3,12 @@ set -e set -x +if grep -r '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis* dist/*.desktop \ + dist/*.svg dist/*.xml; then + echo Trailing whitespace found, aborting + exit 1 +fi + #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then mkdir build && cd build -- cgit v1.2.3