ci: disable frames in lcov HTML coverage report
Change-Id: I82d521b75b9e05aa56f12c19a0b159e2ef966a6d
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 458bbd0..cd3eb76 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -25,10 +25,10 @@
elif has Ubuntu $NODE_LABELS; then
sudo apt-get -qq update
- sudo apt-get -qy install g++ pkg-config python3-minimal \
+ sudo apt-get -qy install build-essential pkg-config python3-minimal \
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 6f6ee88..56baf77 100755
--- a/.jenkins.d/30-coverage.sh
+++ b/.jenkins.d/30-coverage.sh
@@ -16,7 +16,6 @@
genhtml --branch-coverage \
--demangle-cpp \
- --frames \
--legend \
--output-directory build/coverage \
--title "NLSR unit tests" \
diff --git a/.travis.yml b/.travis.yml
index 8990ac7..1ab91c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@
- env: COMPILER=clang++-8
- env: COMPILER=clang++-10
- env: COMPILER=clang++-11
+ - env: COMPILER=clang++-12
# macOS
- os: osx
@@ -42,14 +43,17 @@
osx_image: xcode11.3
env: # default compiler
- os: osx
- osx_image: xcode11.4
+ osx_image: xcode11.6
+ env: # default compiler
+ - os: osx
+ osx_image: xcode12
env: # default compiler
allow_failures:
- env: COMPILER=g++-5
- env: COMPILER=g++-6
- env: COMPILER=clang++-4.0
- - env: COMPILER=clang++-11
+ - env: COMPILER=clang++-12
fast_finish: true
@@ -66,7 +70,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