aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml36
1 files changed, 19 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 9d1600818..534479efb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,4 @@
language: cpp
-compiler:
- - gcc
- - clang
-os:
- - osx
- - linux
-env:
- - PLATFORM=Win32
- - PLATFORM=Win64
- - PLATFORM=Unix
before_install: ./util/travis/before_install.sh
script: ./util/travis/script.sh
sudo: required
@@ -16,14 +6,26 @@ notifications:
email: false
matrix:
fast_finish: true
- exclude:
+ include:
- env: PLATFORM=Win32
- compiler: clang
+ compiler: gcc
+ os: linux
- env: PLATFORM=Win64
+ compiler: gcc
+ os: linux
+ - env: PLATFORM=Unix COMPILER=clang
compiler: clang
- - env: PLATFORM=Win32
- os: osx
- - env: PLATFORM=Win64
- os: osx
- - compiler: gcc
os: osx
+ - env: PLATFORM=Unix COMPILER=g++
+ compiler: gcc
+ os: linux
+ - env: PLATFORM=Unix COMPILER=clang
+ compiler: clang
+ os: linux
+ - env: PLATFORM=Unix COMPILER=g++-6
+ compiler: gcc
+ os: linux
+addons:
+ apt:
+ sources: &sources
+ - ubuntu-toolchain-r-test