.travis.yml: Switch to new trusty machines

Yay, newer server

Gbp-Dch: ignore

diff --git a/.travis.yml b/.travis.yml
index b94d122a47214eeb313441284408a59d61005e68..71d3210c13a9af41c0fd11c8d805285fd11c96eb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,14 @@
 language: cpp
 sudo: required
 language: cpp
 sudo: required

+dist: trusty

 before_install:
 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 sh -c '/bin/echo -e "Package: *\nPin: release n=vivid\nPin-Priority: 1" > /etc/apt/preferences.d/vivid'
  - sudo apt-get update -qq
 install:
  - sudo ./prepare-release travis-ci
  - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ vivid main' -y
  - |
    sudo sh -c '/bin/echo -e "Package: *\nPin: release n=vivid\nPin-Priority: 1" > /etc/apt/preferences.d/vivid'
  - 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
  - sudo apt-get -qq -y -t vivid install gettext

- - export CC=gcc-4.8 CXX=g++-4.8

  - make
 script:
  - make test
  - make
 script:
  - make test