summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2015-11-06 08:52:48 +0100
committerMichael Stapelberg <michael@stapelberg.de>2015-11-06 08:52:48 +0100
commitd15cb5978e004f7e2cab825a39d4274b826f15ec (patch)
tree983fc33cb71d68c014031fde48de9c198d7f9900
parent688d49d5b897ac79a35266428bc43639a5b96169 (diff)
travis: install clang-format-3.5 from llvm repository
Ubuntu utopic disappeared from archive.ubuntu.com, it’s EOL.
-rw-r--r--.travis.yml17
1 files changed, 9 insertions, 8 deletions
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: