warn if apt-key is run unconditionally in maintainerscript

[apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 993492b7e22333c1363db7814c29ff17364b87dd..a076d3e4c82ee0e15eb721d4eb2426d0cb1dab9b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,17 @@
 language: cpp
 language: cpp

+sudo: required
+dist: trusty

 before_install:
 before_install:

- - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- - sudo apt-get update -q
+ - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -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
 install:
  - sudo ./prepare-release travis-ci

- - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- - sudo apt-get -qq update
- - sudo apt-get -qq install g++-4.8
- - export CXX=g++-4.8
-script: make && make test && test/integration/run-tests
+ - 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
+ - sudo ./test/integration/run-tests -q