|
|
@@ -14,7 +14,7 @@ before_install:
|
|
|
before_script:
|
|
|
- mkdir build
|
|
|
- cd build
|
|
|
- - cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS
|
|
|
+ - if [[ $TRAVIS_BRANCH != 'coverity_scan' ]]; then cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS; fi
|
|
|
|
|
|
script:
|
|
|
- test $TRAVIS_BRANCH != coverity_scan || exit 0
|
|
|
@@ -35,13 +35,13 @@ matrix:
|
|
|
include:
|
|
|
- os: linux
|
|
|
compiler: clang
|
|
|
- env: VCMI_PLATFORM='linux' REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PACKAGE=clang-3.4 SUPPORT=libstdc++-4.8-dev
|
|
|
+ env: VCMI_PLATFORM='linux' REAL_CC=clang-3.6 REAL_CXX=clang++-3.6 PACKAGE=clang-3.6 SUPPORT=libstdc++-4.8-dev
|
|
|
- os: linux
|
|
|
compiler: clang
|
|
|
env: VCMI_PLATFORM='linux' REAL_CC=clang-3.5 REAL_CXX=clang++-3.5 PACKAGE=clang-3.5 SUPPORT=libstdc++-4.8-dev
|
|
|
- os: linux
|
|
|
compiler: clang
|
|
|
- env: VCMI_PLATFORM='linux' REAL_CC=clang-3.6 REAL_CXX=clang++-3.6 PACKAGE=clang-3.6 SUPPORT=libstdc++-4.8-dev
|
|
|
+ env: VCMI_PLATFORM='linux' REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PACKAGE=clang-3.4 SUPPORT=libstdc++-4.8-dev
|
|
|
- os: linux
|
|
|
compiler: gcc
|
|
|
env: VCMI_PLATFORM='linux' REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 PACKAGE=g++-4.8 SUPPORT=
|
|
|
@@ -57,8 +57,8 @@ addons:
|
|
|
name: vcmi/vcmi
|
|
|
description: Build submitted via Travis CI
|
|
|
notification_email: [email protected]
|
|
|
- build_command_prepend: cmake -G "Unix Makefiles" . -DENABLE_LAUNCHER=1 -DENABLE_TEST=1
|
|
|
- build_command: make
|
|
|
+ build_command_prepend: "cov-configure --compiler clang-3.6 --comptype clangcc && cov-configure --comptype clangcxx --compiler clang++-3.6 && cmake -G Ninja .. -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=1 -DENABLE_TEST=1"
|
|
|
+ build_command: ninja
|
|
|
branch_pattern: coverity_scan
|
|
|
|
|
|
notifications:
|