From 0edb7269e5b508220b8efdf122990e2ee08cbe65 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Tue, 28 Mar 2017 21:45:08 -0400
Subject: [PATCH] Fix clang-format version used by travis
---
.travis.yml | 7 +++----
scripts/travis/run-format.sh | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 16e53174d..0abc843a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,17 +3,16 @@ language: cpp
dist: trusty
addons:
apt:
- sources:
- - llvm-toolchain-trusty-3.8
packages:
- clang-format-3.8
- clang-tidy-3.8
before_install:
- - wget http://www.cmake.org/files/v3.7/cmake-3.7.1-Linux-x86_64.tar.gz
+ - wget http://www.cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz
install:
- - tar -xf cmake-3.7.1-Linux-x86_64.tar.gz
+ - tar -xf cmake-3.7.2-Linux-x86_64.tar.gz
- export PATH="${PWD}/cmake-3.7.1-Linux-x86_64/bin:${PATH}"
- pip install --user flake8
+ - git config --global clangformat.binary clang-format-3.8
env:
- BUILD_MATRIX_ENTRY=format
script:
diff --git a/scripts/travis/run-format.sh b/scripts/travis/run-format.sh
index 51ba5e565..29e55e0a2 100755
--- a/scripts/travis/run-format.sh
+++ b/scripts/travis/run-format.sh
@@ -16,7 +16,7 @@ cd ${SOURCE_DIR}
# Check C and C++ code with clang-format
echo "Checking formatting for commit range: ${COMMIT_RANGE}"
DIFF="$(./scripts/developer/git/git-clang-format --diff ${COMMIT_RANGE})"
-if [ "${DIFF}" != "no modified files to format" ]
+if [ -n "${DIFF}" ]
then
echo "clang-format:"
echo " Code format checks failed."
--
GitLab