X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=.travis.yml;h=d1d1932b3645ca076e5ebd3dcc4fa875eb8b998f;hb=cd172da6ae4e249f21d79c7096f979ecc611d987;hp=f90e0ebda99bc75ae0207df25082753d53b49ab7;hpb=fdfe4081593268257cd65932bd5353eade45e190;p=i3%2Fi3

diff --git a/.travis.yml b/.travis.yml
index f90e0ebd..d1d1932b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,20 @@ language: c
 compiler:
   - gcc
   - clang
+addons:
+  apt:
+    sources:
+    - llvm-toolchain-precise-3.5
+    # ubuntu-toolchain-r-test contains libstdc++6 >= 4.8 which libllvm3.5 needs.
+    - ubuntu-toolchain-r-test
+    packages:
+    - clang-format-3.5
+    - libllvm3.5
 before_install:
   # The travis VMs run on Ubuntu 12.04 which is very old and a huge pain to get
   # 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"
@@ -31,17 +39,16 @@ before_install:
 
   - sudo cp /tmp/pin /etc/apt/preferences.d/trustypin
   - sudo apt-get update
-  - sudo apt-get install -t trusty libc6 libc6-dev
+  - sudo apt-get install -t trusty libc6 libc6-dev git
   - sudo apt-get install --no-install-recommends devscripts equivs xdotool
-  - 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 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 libxcb-xtest0-dev
   - sudo /bin/sh -c 'cpanm -n -v X11::XCB || true'
   - sudo /bin/sh -c 'cpanm -n -v AnyEvent::I3 || true'
 script:
+  - if [ -a .git/shallow ]; then git fetch --unshallow; fi
   - CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror" make -j
   - (cd testcases && xvfb-run ./complete-run.pl --parallel=1 || (cat latest/complete-run.log; false))
   - clang-format-3.5 -i $(find . -name "*.[ch]" | tr '\n' ' ') && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false)