sonar: sonar

sonar

Signed-off-by: Simen S. Røstad <[email protected]>

Author: simensrostad

.github/workflows/sonarcloud.yml

@@ -1,4 +1,4 @@
-name: Sonarcloud and Twister Native Sim
+name: SonarQube and Twister Native Sim
 on:
   push:
     branches:
@@ -20,7 +20,6 @@ jobs:
     runs-on: build_self_hosted
     container: ghcr.io/zephyrproject-rtos/ci:v0.27.4
     env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
       CMAKE_PREFIX_PATH: /opt/toolchains
     steps:
       - uses: actions/checkout@v4
@@ -58,56 +57,24 @@ jobs:
             apt-get update
             apt install -y curl ruby-full
 
-      - name: Run tests with ASAN, no Sonarcloud and build_wrapper
+      - name: Run tests with ASAN
         working-directory: asset-tracker-template
         run: |
           west twister -T tests/ --enable-coverage --coverage-platform=native_sim -v --inline-logs --integration --enable-asan --enable-lsan --enable-ubsan
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
-
-      - name: Build and test
+      - name: Build and test with coverage
         working-directory: asset-tracker-template
         run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} west twister -T tests/ --enable-coverage --coverage-platform=native_sim -v --inline-logs --integration
+          west twister -T tests/ --enable-coverage --coverage-platform=native_sim -v --inline-logs --integration
 
       - name: Extract coverage into sonarqube xml format
         working-directory: asset-tracker-template
         run: |
           gcovr twister-out -v --merge-mode-functions=separate --exclude='twister-out|drivers' --sonarqube coverage.xml
 
-      - name: Run sonar-scanner on main
-        working-directory: asset-tracker-template
-        if: github.event_name != 'pull_request'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          sonar-scanner \
-            --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \
-            --define project.settings=sonar-project.properties \
-            --define sonar.coverageReportPaths=coverage.xml \
-            --define sonar.inclusions=**/*.c,**/*.h \
-            --define sonar.exclusions=tests/,drivers/sensor/*_dummy/
-
-      - name: Run sonar-scanner on PR
-        working-directory: asset-tracker-template
-        if: github.event_name == 'pull_request'
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@v3
+        with:
+          projectBaseDir: asset-tracker-template
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
-          BASE_REF: ${{ github.event.pull_request.base.ref }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-        run: |
-          sonar-scanner \
-            --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \
-            --define project.settings=sonar-project.properties \
-            --define sonar.coverageReportPaths=coverage.xml \
-            --define sonar.inclusions=**/*.c,**/*.h \
-            --define sonar.exclusions=tests/,drivers/sensor/*_dummy/ \
-            --define sonar.scm.revision=${{ env.HEAD_SHA }} \
-            --define sonar.pullrequest.key=${{ env.PR_NUMBER }} \
-            --define sonar.pullrequest.branch=${{ env.PR_BRANCH }} \
-            --define sonar.pullrequest.base=${{ env.BASE_REF }}

sonar-project.properties

@@ -1,3 +1,7 @@
 sonar.projectKey=nrfconnect_Asset-Tracker-Template
 sonar.organization=nrfconnect
-sonar.host.url=https://sonarcloud.io
+
+# Coverage and analysis settings
+sonar.coverageReportPaths=coverage.xml
+sonar.inclusions=**/*.c,**/*.h
+sonar.exclusions=tests/,drivers/sensor/*_dummy/