From c71f521f3331d105b7de4ad06c6d25b49efae878 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 28 Aug 2013 11:17:48 -0700 Subject: On travis, use native clang matrix and add exclusion rules Hopefully this will fix whatever keeps timing out with apt-get install. --- .travis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to '.travis.yml') 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 -- cgit v1.2.3-60-g2f50