diff --git a/.travis.yml b/.travis.yml index c90714e..7a0adbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } } - env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && GENERATOR='Unix Makefiles' && CONFIG=Debug && GHC_COVERAGE=1" - addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } } + addons: { apt: { packages: ["g++-7", "lcov"], sources: ["ubuntu-toolchain-r-test"] } } - env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8 && GENERATOR='Unix Makefiles' && CONFIG=Release" addons: { apt: { packages: ["g++-8"], sources: ["ubuntu-toolchain-r-test"] } } @@ -52,7 +52,8 @@ install: fi - | if [ "${GHC_COVERAGE}" = "1" ]; then - pip install --user cpp-coveralls + gem install coveralls-lcov + #pip install --user cpp-coveralls fi - $CC --version - $CXX --version @@ -72,6 +73,8 @@ script: after_success: - | if [ "${GHC_COVERAGE}" = "1" ]; then - coveralls --verbose --root .. -E ".*catch.*" + lcov --compat-libtool --directory . --capture --output-file coverage.info + coveralls-lcov coverage.info + #coveralls --verbose --root .. -E ".*catch.*" fi