eipp: properly handle arch-specific provides

[apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8c156e49e011f53dfa15813c876b0618be760f32..2a648c9401c37a98cb91595921f79fc82e470d36 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,19 @@
 language: cpp
 sudo: required
 language: cpp
 sudo: required

+dist: trusty

 before_install:
 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 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 update -qq
 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 -y install gcc-4.8 g++-4.8
- - export CC=gcc-4.8 CXX=g++-4.8
+ - 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

 script:
 script:

- - make

  - make test
  - make test

- - ./test/integration/run-tests
+ - ./test/integration/run-tests -q

  - sudo adduser --force-badname --system --home /nonexistent --no-create-home --quiet _apt || true
  - sudo adduser --force-badname --system --home /nonexistent --no-create-home --quiet _apt || true

- - sudo ./test/integration/run-tests
+ - sudo ./test/integration/run-tests -q