From 3218b07bb7d539e7ff2e78b1920217edc10493ea Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sun, 17 Dec 2017 11:54:48 +0000 Subject: Mores to travis --- .travis.yml | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43fcd193..b86e80be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,25 +68,8 @@ matrix: - addons: apt: - packages: - - clang-3.6 - - libegl1-mesa-dev - - libgles2-mesa-dev - - libglm-dev - - xorg-dev - - libglu1-mesa-dev - - doxygen - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.6 - compiler: clang++-3.6 - env: - - "MATRIX_EVAL=\"CC=clang-3.6 && CXX=clang++-3.6\"" - os: linux - - - addons: - apt: - packages: + packages: + - g++-7 - clang-4.0 - libegl1-mesa-dev - libgles2-mesa-dev @@ -104,7 +87,8 @@ matrix: - addons: apt: - packages: + packages: + - g++-7 - clang-5.0 - libegl1-mesa-dev - libgles2-mesa-dev @@ -121,17 +105,17 @@ matrix: os: linux - env: - - "MATRIX_EVAL=\"brew install gcc5 && CC=gcc-5 && CXX=g++-5\"" + - "MATRIX_EVAL=\"rvm use 2.3.3 && brew update && brew install gcc5 && CC=gcc-5 && CXX=g++-5\"" os: osx osx_image: xcode8 - env: - - "MATRIX_EVAL=\"brew install gcc6 && CC=gcc-6 && CXX=g++-6\"" + - "MATRIX_EVAL=\"rvm use 2.3.3 && brew update && brew install gcc6 && CC=gcc-6 && CXX=g++-6\"" os: osx osx_image: xcode8 - env: - - "MATRIX_EVAL=\"brew install gcc && CC=gcc-7 && CXX=g++-7\"" + - "MATRIX_EVAL=\"rvm use 2.3.3 && brew update && brew install gcc && CC=gcc-7 && CXX=g++-7\"" os: osx osx_image: xcode8 notifications: -- cgit