X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3lock;a=blobdiff_plain;f=.travis.yml;h=15ad1e4dbb68a4f0b0b106074999340b04e97dda;hp=23be3b0641aeee1d9093145ebc1a95c3a3cd57db;hb=HEAD;hpb=d52cc44605e6df72fe9e50471868417020b2d286 diff --git a/.travis.yml b/.travis.yml index 23be3b0..15ad1e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ # Use Ubuntu 14.04 (trusty), as per http://blog.travis-ci.com/2015-10-14-opening-up-ubuntu-trusty-beta/ -sudo: required +sudo: false dist: trusty +services: + - docker language: c compiler: - gcc @@ -9,21 +11,7 @@ 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: - - "echo 'APT::Default-Release \"trusty\";' | sudo tee /etc/apt/apt.conf.d/default-release" - - "echo 'deb http://archive.ubuntu.com/ubuntu/ xenial main universe' | sudo tee /etc/apt/sources.list.d/wily.list" - - sudo apt-get update - - sudo apt-get --force-yes -y install -t xenial 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) + - docker build --pull --no-cache --rm -t=i3lock -f travis/Dockerfile . + - docker run -e CC=$CC -v $PWD:/usr/src:rw i3lock /bin/sh -c 'autoreconf -fi && mkdir -p build && cd build && (../configure || (cat config.log; false)) && make -j V=1 CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror"'