Corrected the build matrix and removed inline logic.
This commit is contained in:
parent
6d97d8bf71
commit
4fadfa5c22
36
.travis.yml
36
.travis.yml
@ -31,26 +31,51 @@ env:
|
|||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
env: CONF=debug ARCH=x86
|
- env: CONF=debug ARCH=x86
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
- *default_packages
|
- *default_packages
|
||||||
- g++-multilib
|
- g++-multilib
|
||||||
- libc6-dbg:i386
|
- libc6-dbg:i386
|
||||||
include:
|
- env: CONF=release ARCH=x86
|
||||||
env: CONF=release ARCH=x86
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
- *default_packages
|
- *default_packages
|
||||||
- g++-multilib
|
- g++-multilib
|
||||||
- libc6-dbg:i386
|
- libc6-dbg:i386
|
||||||
|
- env: CONF=debug ARCH=x86 GCOV_FLAGS='--coverage'
|
||||||
|
compiler: gcc
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- *default_packages
|
||||||
|
- g++-multilib
|
||||||
|
- libc6-dbg:i386
|
||||||
|
after_success:
|
||||||
|
- ./travis-coveralls.sh
|
||||||
|
- env: CONF=debug ARCH=x86_64 GCOV_FLAGS='--coverage'
|
||||||
|
compiler: gcc
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- *default_packages
|
||||||
|
- g++-multilib
|
||||||
|
- libc6-dbg:i386
|
||||||
|
after_success:
|
||||||
|
- ./travis-coveralls.sh
|
||||||
|
# These jobs report code coverage so they need extra environment variables
|
||||||
|
# and commands
|
||||||
|
exclude:
|
||||||
|
- env: CONF=debug ARCH=x86_64
|
||||||
|
compiler: gcc
|
||||||
|
- env: CONF=debug ARCH=x86
|
||||||
|
compiler: gcc
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
# hack to avoid Valgrind bug (https://bugs.kde.org/show_bug.cgi?id=326469),
|
# hack to avoid Valgrind bug (https://bugs.kde.org/show_bug.cgi?id=326469),
|
||||||
# exposed by merging PR#163 (using -march=native)
|
# exposed by merging PR#163 (using -march=native)
|
||||||
- if [ "$CC" = "gcc" ] && [ "$CONF" = "debug" ]; then export GCOV_FLAGS='--coverage'; fi
|
|
||||||
- sed -i "s/-march=native//" CMakeLists.txt
|
- sed -i "s/-march=native//" CMakeLists.txt
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- >
|
- >
|
||||||
@ -70,6 +95,3 @@ script:
|
|||||||
- ctest -V `[ "$CONF" = "release" ] || echo "-E perftest"`
|
- ctest -V `[ "$CONF" = "release" ] || echo "-E perftest"`
|
||||||
- make travis_doc
|
- make travis_doc
|
||||||
|
|
||||||
after_success:
|
|
||||||
- if [ "$CC" = "gcc" ] && [ "$CONF" = "debug" ]; then pip install --user cpp-coveralls; fi
|
|
||||||
- if [ "$CC" = "gcc" ] && [ "$CONF" = "debug" ]; then coveralls -r .. --gcov-options '\-lp' -e thirdparty -e example -e test -e build/CMakeFiles -e include/rapidjson/msinttypes -e include/rapidjson/internal/meta.h -e include/rapidjson/error/en.h; fi
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user