diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-28 11:17:48 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-28 11:17:48 -0700 |
| commit | c71f521f3331d105b7de4ad06c6d25b49efae878 (patch) | |
| tree | 818c9a503179198d762f5e66bb956bcae308820e /.travis.yml | |
| parent | 2d4c855e377666993a7e2569ff2c5044be3325e0 (diff) | |
| download | tmwa-c71f521f3331d105b7de4ad06c6d25b49efae878.tar.gz tmwa-c71f521f3331d105b7de4ad06c6d25b49efae878.tar.bz2 tmwa-c71f521f3331d105b7de4ad06c6d25b49efae878.tar.xz tmwa-c71f521f3331d105b7de4ad06c6d25b49efae878.zip | |
On travis, use native clang matrix and add exclusion rules
Hopefully this will fix whatever keeps timing out with apt-get install.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index f1f370d..30cb6d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,11 +53,25 @@ after_script: # compiler: gcc-4.6 # compiler: gcc-4.7 # compiler: clang +compiler: + - gcc + - clang ## Environment variables to expand the build matrix ## Needed because 'compiler: gcc' overwrites CXX +## https://github.com/travis-ci/travis-ci/issues/979 env: - REAL_CXX=g++-4.6 - REAL_CXX=g++-4.7 - REAL_CXX=g++-4.8 - REAL_CXX=clang++ +matrix: + exclude: + - compiler: gcc + env: REAL_CXX=clang++ + - compiler: clang + env: REAL_CXX=g++-4.6 + - compiler: clang + env: REAL_CXX=g++-4.7 + - compiler: clang + env: REAL_CXX=g++-4.8 |