From 826d5612fe1ccf9ed7de6319f189838a0090ac24 Mon Sep 17 00:00:00 2001 From: Lorenz Bucher Date: Fri, 3 Oct 2025 18:25:54 +0200 Subject: [PATCH 1/3] Sonar: switch from build wrapper to compilation DB --- .github/workflows/build-sonarqube.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-sonarqube.yml b/.github/workflows/build-sonarqube.yml index 6caf858..ba2c6fb 100644 --- a/.github/workflows/build-sonarqube.yml +++ b/.github/workflows/build-sonarqube.yml @@ -22,8 +22,6 @@ jobs: gcovr --version # sudo apt-get install -y g++-11 gcc-11 - - name: Install Build Wrapper - uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v5 - name: Setup & Cmake working-directory: deploy env: @@ -32,15 +30,14 @@ jobs: run: | mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=Yes ../.. + cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=Yes ../.. - name: Build & Run Tests env: CTEST_OUTPUT_ON_FAILURE: 1 working-directory: deploy/build run: | - mkdir -p bw-output - build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make -j 4 + cmake --build . -j 4 --target HyperBufferTest ./HyperBufferTest cd .. mkdir -p report From 8e7edce5ec7026cbad4ac8a1cdaa2acd95471a5a Mon Sep 17 00:00:00 2001 From: Lorenz Bucher Date: Fri, 3 Oct 2025 18:29:36 +0200 Subject: [PATCH 2/3] Cmake -B to set build dir --- .github/workflows/build-sonarqube.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-sonarqube.yml b/.github/workflows/build-sonarqube.yml index ba2c6fb..90de6f1 100644 --- a/.github/workflows/build-sonarqube.yml +++ b/.github/workflows/build-sonarqube.yml @@ -30,7 +30,7 @@ jobs: run: | mkdir -p build cd build - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=Yes ../.. + cmake -B . -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DCMAKE_BUILD_TYPE=Release -DCODE_COVERAGE=Yes ../.. - name: Build & Run Tests env: @@ -51,4 +51,4 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: args: > - --define sonar.cfamily.compile-commands=deploy/build/${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json + --define sonar.cfamily.compile-commands=deploy/build/compile_commands.json From aefb04380dfe1112aac9e81b4c3ab3b10dbb64dd Mon Sep 17 00:00:00 2001 From: Lorenz Bucher Date: Fri, 3 Oct 2025 18:35:39 +0200 Subject: [PATCH 3/3] remove BUILD_WRAPPER_OUT_DIR --- .github/workflows/build-sonarqube.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-sonarqube.yml b/.github/workflows/build-sonarqube.yml index 90de6f1..92362e2 100644 --- a/.github/workflows/build-sonarqube.yml +++ b/.github/workflows/build-sonarqube.yml @@ -7,7 +7,6 @@ jobs: name: Linux, GCC, Release, Coverage & SonarQube runs-on: ubuntu-22.04 env: - BUILD_WRAPPER_OUT_DIR: 'bw-output' # Directory where build-wrapper output will be placed cxx: g++-11 cc: gcc-11 steps: