i3lock: Stop leaking the image_path dup. (#93)

[i3/i3lock] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index e4d777b0596c7783e7ba7292e91c58a0453c3005..5129c272803f57d6eb789ded3beff528fb62fa2b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,29 @@
+# Use Ubuntu 14.04 (trusty), as per http://blog.travis-ci.com/2015-10-14-opening-up-ubuntu-trusty-beta/
+sudo: required
+dist: trusty
 language: c
 compiler:
   - gcc
   - clang
+addons:
+  apt:
+    packages:
+    - clang-format-3.5
+    - pkg-config
+    - libpam0g-dev
+    - libcairo2-dev
+    - libxcb1-dev
+    - libxcb-dpms0-dev
+    - libxcb-image0-dev
+    - libxcb-util0-dev
+    - libev-dev
+    - libxcb-xinerama0-dev
+    - libxcb-xkb-dev
 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"
+  - "echo 'APT::Default-Release \"trusty\";' | sudo tee /etc/apt/apt.conf.d/default-release"
+  - "echo 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' | sudo tee /etc/apt/sources.list.d/wily.list"
   - sudo apt-get update
-  - sudo apt-get install -t utopic clang-format-3.5
-  - clang-format-3.5 --version
-install:
-  # TODO: Once libxkbcommon >= 0.5.0 is in Debian, install it from there.
-  # These are the Build-Depends of libxkbcommon:
-  - sudo apt-get install pkg-config xutils-dev bison flex libx11-dev libxcb-xkb-dev x11-xkb-utils x11proto-core-dev x11proto-kb-dev xkb-data xvfb
-  - (cd /tmp && wget -nv https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.5.0.tar.gz && tar xf xkbcommon-0.5.0.tar.gz && cd libxkbcommon-xkbcommon-0.5.0; ./autogen.sh && ./configure && make && sudo make install)
-  - sudo apt-get install pkg-config libpam0g-dev libcairo2-dev libxcb1-dev libxcb-dpms0-dev libxcb-image0-dev libxcb-util0-dev libev-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbfile-dev
+  - sudo apt-get --force-yes -y install -t wily libxkbcommon-dev libxkbcommon-x11-dev
 script:
   - make -j
   - clang-format-3.5 -i *.[ch] && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false)