From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 14 Mar 2015 21:32:03 +0000 (+0100)
Subject: travis: verify code was formatted using clang-format
X-Git-Tag: 4.10.1~50
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cd48bcf2a55e425ca270cb1b01569acbd99ac26d;p=i3%2Fi3

travis: verify code was formatted using clang-format
---

diff --git a/.travis.yml b/.travis.yml
index c2179044..5876ae62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ before_install:
   # into a state where we can build a recent version of i3 :(.
   - "echo 'deb http://archive.ubuntu.com/ubuntu/ trusty main universe' | sudo tee /etc/apt/sources.list.d/trusty.list"
   - "echo 'APT::Default-Release \"precise\";' | sudo tee /etc/apt/apt.conf.d/default-release"
+  - "echo 'deb http://archive.ubuntu.com/ubuntu/ utopic main universe' | sudo tee /etc/apt/sources.list.d/utopic.list"
 
   - "echo 'Package: libc6' > /tmp/pin"
   - "echo 'Pin: release n=trusty' >> /tmp/pin"
@@ -32,11 +33,15 @@ before_install:
   - sudo apt-get update
   - sudo apt-get install -t trusty libc6 libc6-dev
   - sudo apt-get install --no-install-recommends devscripts equivs
+  - sudo apt-get install -t utopic clang-format-3.5
+  - clang-format-3.5 --version
 install:
   - sudo mk-build-deps --install --remove --tool 'apt-get --no-install-recommends' debian/control
   # Install as many dependencies as possible via apt because cpanm is not very reliable/easy to debug.
   - sudo apt-get install --no-install-recommends libanyevent-perl libanyevent-i3-perl libextutils-pkgconfig-perl xcb-proto cpanminus xvfb xserver-xephyr xauth libinline-perl libxml-simple-perl libmouse-perl libmousex-nativetraits-perl libextutils-depends-perl perl-modules libtest-deep-perl libtest-exception-perl libxml-parser-perl libtest-simple-perl libtest-fatal-perl libdata-dump-perl libtest-differences-perl libxml-tokeparser-perl libtest-use-ok-perl libipc-run-perl
   - sudo /bin/sh -c 'cpanm -n -v X11::XCB || true'
   - sudo /bin/sh -c 'cpanm -n -v AnyEvent::I3 || true'
-script: make -j && (cd testcases && xvfb-run ./complete-run.pl --parallel=1)
-after_failure: cat testcases/latest/complete-run.log
+script:
+  - make -j
+  - (cd testcases && xvfb-run ./complete-run.pl --parallel=1 || (cat latest/complete-run.log; false))
+  - clang-format-3.5 -i **/*.[ch] && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false)