From dfb00365ba395deb1cb13d09ffb62d52aacc9e84 Mon Sep 17 00:00:00 2001
From: Uwe Seimet <Uwe.Seimet@seimet.de>
Date: Thu, 30 Nov 2023 21:13:47 +0100
Subject: [PATCH] Workflow update

---
 .github/workflows/analyze.yml | 44 +++++++++++------------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index 06bdf20a..65133a6f 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -28,38 +28,22 @@ jobs:
       - name: Install additional packages
         run: sudo apt install --yes ${{ env.PACKAGES }}
 
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - name: Set up Python for gcovr
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-
-      - name: Install gcovr
-        run: pip install gcovr==5.0 # 5.1 is not supported
-
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v1
-
-      - name: Run build-wrapper
-        run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make -j $(nproc) coverage DEBUG=1
+      - name: Generate coverage data
+        run: gcovr --sonarqube > coverage.xml
 
       - name: Generate coverage data
         run: gcovr --sonarqube > coverage.xml
 
       - name: Run sonar-scanner
-        run: |
-          sonar-scanner \
-          --define sonar.host.url=${{ env.SONAR_SERVER_URL }} \
-          --define sonar.projectKey=${{ env.SONAR_PROJECT_KEY }} \
-          --define sonar.organization=${{ env.SONAR_ORGANIZATION }} \
-          --define sonar.cfamily.build-wrapper-output=${{ env.BUILD_WRAPPER_OUT_DIR }} \
-          --define sonar.coverageReportPaths=coverage.xml \
-          --define sonar.exclusions="obj/**,bin/**,generated/**" \
-          --define sonar.coverage.exclusions="test/**" \
-          --define sonar.cpd.exclusions="test/**"
+        uses: sonarsource/sonarcloud-github-action@master
+        with:
+          projectBaseDir: cpp
+    args: >
+          -Dsonar.host.url=${{ env.SONAR_SERVER_URL }} \
+          -Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }} \
+          -Dsonar.organization=${{ env.SONAR_ORGANIZATION }} \
+          -Dsonar.cfamily.build-wrapper-output=${{ env.BUILD_WRAPPER_OUT_DIR }} \
+          -Dsonar.coverageReportPaths=coverage.xml \
+          -Dsonar.exclusions="obj/**,bin/**,generated/**" \
+          -Dsonar.coverage.exclusions="test/**" \
+          -Dsonar.cpd.exclusions="test/**"