Add conflicting Signed-By values to error message

[apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8be0285e004f71909d0e777f0cdd70924b78a7e5..a076d3e4c82ee0e15eb721d4eb2426d0cb1dab9b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,16 @@
 language: cpp
 sudo: required
+dist: trusty
 before_install:
- - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ vivid main' -y
+ - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -y
  - |
-   sudo sh -c '/bin/echo -e "Package: *\nPin: release n=vivid\nPin-Priority: 1" > /etc/apt/preferences.d/vivid'
+   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 install gcc-4.8 g++-4.8
- - sudo apt-get -qq -y -t vivid install gettext
- - export CC=gcc-4.8 CXX=g++-4.8
-script:
+ - sudo apt-get -qq -y -t wily install gettext liblz4-dev python3-apt
  - make
+script:
  - make test
  - ./test/integration/run-tests -q
  - sudo adduser --force-badname --system --home /nonexistent --no-create-home --quiet _apt || true