travis: back to previous matrix

2015-11-06 12:37:30 +01:00 · 2015-11-06 12:37:30 +01:00 · 4b64d196db
commit 4b64d196db
parent 789637db94
1 changed files with 1 additions and 8 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -7,19 +7,12 @@ os:
 compiler:
  - gcc
  - clang
-  
+
 env:
  - TRAVIS_BUILD_TYPE=Debug    TRAVIS_SHARED_LIBS=OFF  TRAVIS_STRICT_C90=OFF  TRAVIS_MAKE_CHECK=ON  TRAVIS_COVERALLS=ON
  - TRAVIS_BUILD_TYPE=Debug    TRAVIS_SHARED_LIBS=ON   TRAVIS_STRICT_C90=ON   TRAVIS_MAKE_CHECK=ON  TRAVIS_COVERALLS=OFF
  - TRAVIS_BUILD_TYPE=Release  TRAVIS_SHARED_LIBS=OFF  TRAVIS_STRICT_C90=OFF  TRAVIS_MAKE_CHECK=OFF TRAVIS_COVERALLS=OFF

-matrix:
-  exclude:
-    - os: linux
-          compiler: clang
-    - os: osx
-          compiler: gcc
-
 script:
  - chmod +x travis-build-script.sh
  - ./travis-build-script.sh