aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-12-17 11:54:48 +0000
committerYann Herklotz <ymherklotz@gmail.com>2017-12-17 11:54:48 +0000
commit3218b07bb7d539e7ff2e78b1920217edc10493ea (patch)
tree5bf17d62576875cc51ab1d918294743b8320eb64 /.travis.yml
parente137b49ca73e7f9ddf4c9889127506a220b2ebec (diff)
downloadYAGE-3218b07bb7d539e7ff2e78b1920217edc10493ea.tar.gz
YAGE-3218b07bb7d539e7ff2e78b1920217edc10493ea.zip
Mores to travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml30
1 files 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: