diff options
| author | Simon Warta <[email protected]> | 2015-07-08 12:02:36 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2015-07-08 12:02:36 +0200 |
| commit | 7e469858c6bdef9eb42971d10849ca0329a3b236 (patch) | |
| tree | 2d8aefd4be593d3a74857a846b0430b11d546481 /.travis.yml | |
| parent | b079d7176a621950fcf1ce7aa1a164b6d9d6f5d3 (diff) | |
Add changs to have different travis configurations on master and coverity_scan
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c6213b4cc..35abc79d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,21 @@ language: cpp +sudo: required + +# BEGIN BUILD MATRIX +# +# Build matrix must be smaller on branch coverity_scan because quota allows +# only 5 Coverity Scan jobs at once. Thus we have different versions of this +# file on branch master and coverity_scan. +# +# Please keep this file as much in sync as possible to allow easy merging +# from master into coverity_scan and only have differences in the build +# matrix block. +# +# Check the difference as follows: +# $ git checkout master +# $ git checkout coverity_scan +# $ git difftool master coverity_scan .travis.yml os: - linux - osx @@ -23,8 +39,7 @@ matrix: env: BUILD_MODE="coverage" - compiler: clang env: BUILD_MODE="sanitizer" - -sudo: required +# END BUILD MATRIX install: - ./src/scripts/ci/setup.sh |