From 8656478230c9bb319ba1279ef0c9cffce0f37853 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 29 Aug 2022 17:05:25 +0000 Subject: ci(sonar): build with coverage information Also: - Install clang-11 as default compiler with make deps Ref: HICN-752 Change-Id: Id6faf99ddd9c43a1c5804b8ace8df9dad27b82e6 Signed-off-by: Mauro Sardara --- Makefile | 2 +- cmake | 2 +- scripts/run-sonar.sh | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 91d9eb888..df5f93b73 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ endif DEB_DEPENDS = cmake ninja-build unzip python3-ply libasio-dev DEB_DEPENDS += libconfig-dev libconfig++-dev libevent-dev -DEB_DEPENDS += build-essential vpp-dev libvppinfra-dev +DEB_DEPENDS += llvm-11-tools llvm-11 clang-11 vpp-dev libvppinfra-dev DEB_DEPENDS += vpp-plugin-core libcurl4-openssl-dev libssl-dev DEB_DEPENDS += doxygen diff --git a/cmake b/cmake index 5a6b4d427..859b487ef 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 5a6b4d42706c079f596576a9235974ba806f469f +Subproject commit 859b487ef401b723aeea2800079bc8df14ad7156 diff --git a/scripts/run-sonar.sh b/scripts/run-sonar.sh index 7bb179d05..38547bbcf 100755 --- a/scripts/run-sonar.sh +++ b/scripts/run-sonar.sh @@ -22,11 +22,12 @@ cd /workspace git config --global --add safe.directory /workspace git config --global --add safe.directory /workspace/cmake -$HOME/.sonar/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make build +export SONAR_BUILD_WRAPPER=$HOME/.sonar/build-wrapper-linux-x86/build-wrapper-linux-x86-64 +make SONAR_OUT_DIR=bw-output build-coverage $SONAR_SCANNER_HOME/bin/sonar-scanner \ --Dsonar.organization=$PROJECT_ORGANIZATION \ --Dsonar.projectKey=$PROJECT_KEY \ --Dsonar.sources=/workspace \ --Dsonar.cfamily.build-wrapper-output=bw-output \ --Dsonar.host.url=$SONAR_HOST_URL + -Dsonar.organization=$PROJECT_ORGANIZATION \ + -Dsonar.projectKey=$PROJECT_KEY \ + -Dsonar.sources=/workspace \ + -Dsonar.cfamily.build-wrapper-output=bw-output \ + -Dsonar.host.url=$SONAR_HOST_URL -- cgit 1.2.3-korg