diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-11-05 16:48:14 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-11-05 17:28:20 -0800 |
| commit | 9cc2c815ca6aa4899d6243072ccf840844d00d67 (patch) | |
| tree | 59cf373c3a5667642db4bc0f80269a798b8350db | |
| parent | ee57a3f992817cf7a378afc7bf069dbe992efc7a (diff) | |
| download | kati-9cc2c815ca6aa4899d6243072ccf840844d00d67.tar.gz | |
Update travis config; require clang-format to pass
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rwxr-xr-x | clang-format-check | 16 |
2 files changed, 29 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9c14f63..e2d9e21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,16 +6,27 @@ sudo: required compiler: - clang +addons: + apt: + update: true + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 + packages: + - clang-7 + - clang-format-7 + - realpath + cache: apt before_script: - - sudo apt-get update -qq - - sudo apt-get install -y realpath - wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip - unzip ninja-linux.zip -d ~/bin script: + - export CXX=clang++-7 - make -j4 ckati ckati_tests + - ./clang-format-check - ruby runtest.rb -c - ruby runtest.rb -c -n - ruby runtest.rb -c -n -a diff --git a/clang-format-check b/clang-format-check new file mode 100755 index 0000000..7eaa1c2 --- /dev/null +++ b/clang-format-check @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +CLANG_FORMAT="clang-format-7" +if [ -z "$(which $CLANG_FORMAT)" ]; then + CLANG_FORMAT="clang-format" +fi + +for f in $(ls *.cc *.h); do + if ! diff -U 1 <($CLANG_FORMAT $f) $f; then + echo + echo "!!!!!!" + echo "!! Failed clang-format check, please run 'clang-format -i *.cc *.h'" 1>&2 + echo "!!!!!!" + exit 1 + fi +done |