X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3status;a=blobdiff_plain;f=.travis.yml;h=7ceaddffdf6c2ee646800712c109422d00e35948;hp=9a81d9723641d91b193d0e348dc70c8dbce41f20;hb=49461ac56f3cbea432f4c6ec547410162237fcf7;hpb=eb13374063adb4db59bd15e65402731a2857323e

diff --git a/.travis.yml b/.travis.yml
index 9a81d97..7ceaddf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,26 @@
+sudo: required
+dist: trusty
 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
-install:
-  - sudo apt-get install libconfuse-dev libyajl-dev libasound2-dev libiw-dev asciidoc libcap2-bin
+addons:
+  # See http://docs.travis-ci.com/user/apt/
+  apt:
+    packages:
+    - libconfuse-dev
+    - libyajl-dev
+    - libasound2-dev
+    - libpulse-dev
+    - libnl-genl-3-dev
+    - asciidoc
+    # xmlto pulls in a2x which we need for generating manpages from asciidoc.
+    - xmlto
+    - libcap2-bin
+    - clang-format-3.8
+    - libllvm3.5
 script:
-  - make -j
-  - clang-format-3.5 -i **/*.[ch] && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false)
+  - clang-format-3.8 -i $(find . -name "*.[ch]" | tr '\n' ' ') && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false)
+  # TODO: re-enable sanitizers once issues are fixed
+  - autoreconf -fi && mkdir -p build && cd build && (../configure --disable-sanitizers || (cat config.log; false)) && make -j V=1
+  - make -j check V=1 || (cat test-suite.log; false)