Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records

[apt.git] / .travis.yml

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

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

  - sudo apt-get update -q
  - sudo apt-get update -q

+install:

  - sudo ./prepare-release travis-ci
  - sudo ./prepare-release travis-ci

- - sudo apt-get install -q --no-install-recommends stunnel4 db-util
+ - 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
 script: make && make test && test/integration/run-tests