diff options
| author |   Luca Muscariello <muscariello@ieee.org> | 2022-08-29 17:10:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2022-08-29 17:10:27 +0000 |
| commit | 1d07ab7765be14382f8b711f4211fffb2518581a (patch) | |
| tree | 6e6e6c8051b2917db5b963b31949ccb20f5ca2eb | |
| parent | 456a47ffcfb256beaae0b04d9021035c0e154ace (diff) | |
| parent | 8656478230c9bb319ba1279ef0c9cffce0f37853 (diff) | |
Merge "ci(sonar): build with coverage information"
| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | cmake | 0 | ||||
| -rwxr-xr-x | scripts/run-sonar.sh | 13 |
3 files changed, 8 insertions, 7 deletions
@@ -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 -Subproject 5a6b4d42706c079f596576a9235974ba806f469 +Subproject 859b487ef401b723aeea2800079bc8df14ad715 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 |