diff --git a/.travis.yml b/.travis.yml index fa4600b..73e8c16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,15 +10,23 @@ matrix: - compiler: clang os: linux env: ARCH=native + dist: trusty + sudo: required - compiler: gcc os: linux env: ARCH=native + dist: trusty + sudo: required - compiler: gcc os: linux env: ARCH=mingw32 + dist: trusty + sudo: required - compiler: gcc os: linux env: ARCH=mingw64 + dist: trusty + sudo: required script: "./scripts/travis" diff --git a/scripts/travis b/scripts/travis index 542161d..408bc75 100755 --- a/scripts/travis +++ b/scripts/travis @@ -21,9 +21,6 @@ if [ "x$ARCH" = "xnative" ]; then make make test else - sudo apt-get update - sudo apt-get install -y python-software-properties - sudo apt-add-repository -y ppa:kalakris/cmake sudo apt-get update sudo apt-get install -y cmake ninja-build cmake -GNinja .. @@ -38,10 +35,6 @@ else export CC=$CPU-w64-mingw32-gcc if [ -z $(which $CC) ]; then - # Update Ubuntu 12.04 with current mingw toolchain - sudo apt-get update - sudo apt-get install -y python-software-properties - sudo apt-add-repository -y ppa:tobydox/mingw-x-precise sudo apt-get update sudo apt-get install -y $ARCH-x-gcc make export PATH=$PATH:/opt/$ARCH/bin