X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=.travis.yml;h=fb7329091c0694039758af968d47d4f30f33e59c;hb=d15cb5978e004f7e2cab825a39d4274b826f15ec;hp=e4d777b0596c7783e7ba7292e91c58a0453c3005;hpb=a0bca728c9d55f8c2b23ebd11c3789fc89bbca6f;p=i3%2Fi3lock

diff --git a/.travis.yml b/.travis.yml
index e4d777b..fb73290 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,17 @@
 language: c
 compiler:
   - gcc
-  - clang
-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 i3status :(.
-  - "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"
-  - sudo apt-get update
-  - sudo apt-get install -t utopic clang-format-3.5
-  - clang-format-3.5 --version
+# TODO: re-enable clang once libxkbcommon >= 0.5.0 can be installed from packages. Compiling libxkbcommon with clang fails in the libtool step.
+#  - 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
 install:
   # TODO: Once libxkbcommon >= 0.5.0 is in Debian, install it from there.
   # These are the Build-Depends of libxkbcommon: