From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 6 Nov 2015 07:52:48 +0000 (+0100)
Subject: travis: install clang-format-3.5 from llvm repository
X-Git-Tag: 2.8~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d15cb5978e004f7e2cab825a39d4274b826f15ec;p=i3%2Fi3lock

travis: install clang-format-3.5 from llvm repository

Ubuntu utopic disappeared from archive.ubuntu.com, it’s EOL.
---

diff --git a/.travis.yml b/.travis.yml
index 9b4a9f6..fb73290 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,15 @@ compiler:
   - gcc
 # TODO: re-enable clang once libxkbcommon >= 0.5.0 can be installed from packages. Compiling libxkbcommon with clang fails in the libtool step.
 #  - 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
+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: