prepare-release: Also search for libraries in CMake locations

[apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 2a648c9401c37a98cb91595921f79fc82e470d36..a076d3e4c82ee0e15eb721d4eb2426d0cb1dab9b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,13 @@ sudo: required
 dist: trusty
 before_install:
  - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -y
 dist: trusty
 before_install:
  - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -y

- - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y

  - |
    sudo sh -c '/bin/echo -e "Package: *\nPin: release n=wily\nPin-Priority: 1" > /etc/apt/preferences.d/wily'
  - sudo apt-get update -qq
 install:
  - sudo ./prepare-release travis-ci
  - sudo apt-get -qq -y -t wily install gettext liblz4-dev python3-apt
  - |
    sudo sh -c '/bin/echo -e "Package: *\nPin: release n=wily\nPin-Priority: 1" > /etc/apt/preferences.d/wily'
  - sudo apt-get update -qq
 install:
  - sudo ./prepare-release travis-ci
  - sudo apt-get -qq -y -t wily install gettext liblz4-dev python3-apt

- - sudo apt-get -qq -y install gcc-5 g++-5
- - CC=gcc-5 CXX=g++-5 make
+ - make

 script:
  - make test
  - ./test/integration/run-tests -q
 script:
  - make test
  - ./test/integration/run-tests -q