ci: disable frames in lcov HTML coverage report
Change-Id: Ic55b614ca68bb694b19bce6a56ce5fa3f0728a93
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 458bbd0..d4d9c33 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -29,6 +29,6 @@
libboost-all-dev libssl-dev libsqlite3-dev
if [[ $JOB_NAME == *"code-coverage" ]]; then
- sudo apt-get -qy install gcovr lcov libgd-perl
+ sudo apt-get -qy install gcovr lcov
fi
fi
diff --git a/.jenkins.d/30-coverage.sh b/.jenkins.d/30-coverage.sh
index 7f8ae58..46a8e33 100755
--- a/.jenkins.d/30-coverage.sh
+++ b/.jenkins.d/30-coverage.sh
@@ -23,7 +23,6 @@
genhtml --branch-coverage \
--demangle-cpp \
- --frames \
--legend \
--output-directory build/coverage \
--title "NDNS unit tests" \
diff --git a/.travis.yml b/.travis.yml
index 7c63efd..8ff6d27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@
- env: COMPILER=clang++-8
- env: COMPILER=clang++-10
- env: COMPILER=clang++-11
+ - env: COMPILER=clang++-12
# macOS
- os: osx
@@ -38,9 +39,15 @@
- os: osx
osx_image: xcode11.3
env: # default compiler
+ - os: osx
+ osx_image: xcode11.6
+ env: # default compiler
+ - os: osx
+ osx_image: xcode12
+ env: # default compiler
allow_failures:
- - env: COMPILER=clang++-11
+ - env: COMPILER=clang++-12
fast_finish: true
@@ -57,7 +64,7 @@
# https://apt.llvm.org/
LLVM_REPO=${COMPILER/clang++/llvm-toolchain-${TRAVIS_DIST}}
travis_retry wget -nv -O - "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
- travis_retry sudo add-apt-repository -y "deb http://apt.llvm.org/${TRAVIS_DIST}/ ${LLVM_REPO%-11} main"
+ travis_retry sudo add-apt-repository -y "deb http://apt.llvm.org/${TRAVIS_DIST}/ ${LLVM_REPO%-12} main"
travis_retry sudo apt-get -qq update
;;
esac