Skip to content

Commit

Permalink
Merge pull request #596 from tpaviot/review/travis-fix
Browse files Browse the repository at this point in the history
Update travis build matrix
  • Loading branch information
tpaviot committed Jan 2, 2016
2 parents 2af4fcc + 9da9f03 commit 7873399
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ env:
matrix:
include:
- compiler: gcc
env: RUN_TESTS=true
env: RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
- compiler: clang
env: RUN_TESTS=true
env: RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
- compiler: gcc
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=OFF
- compiler: gcc
Expand All @@ -19,16 +19,16 @@ matrix:
- compiler: gcc
env: OCE_USE_PCH=OFF OCE_COPY_HEADERS_BUILD=ON
- compiler: gcc
env: OCE_USE_PCH=OFF OCE_COPY_HEADERS_BUILD=ON OCE_MULTITHREAD_LIBRARY=OPENMP
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON OCE_MULTITHREAD_LIBRARY=OPENMP
- compiler: gcc
env: OCE_USE_PCH=OFF OCE_COPY_HEADERS_BUILD=ON OCE_MULTITHREAD_LIBRARY=TBB
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON OCE_MULTITHREAD_LIBRARY=TBB
exclude:
- env: RUN_TESTS=false OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=OFF
allow_failures:
- compiler: gcc
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
- compiler: gcc
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=OFF
env: RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
- compiler: clang
env: RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON

before_install:
- sudo apt-get update -q
Expand Down

0 comments on commit 7873399

Please sign in to comment.