Sonar

Author: sumitjnn

.github/workflows/build-sonar.yml

@@ -60,14 +60,6 @@ jobs:
           -Dmaven.wagon.http.retryHandler.count=3
           -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
 
-      - name: Archive build artifacts
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: Build debug files
-          path: |
-            **/target/rat.txt
-            **/target/surefire-reports/*
 
       - name: Validate PR
         id: validate_pr
@@ -84,7 +76,6 @@ jobs:
           JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
         run: >-
           mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -fae -T 2 -B -V
-          -Dmaven.repo.local=$HOME/.m2/repository11
           -DcloudBuild
           -Pcoverage
           -Dmaven.wagon.http.retryHandler.count=3
@@ -93,23 +84,3 @@ jobs:
           -Dsonar.pullrequest.branch=${{ steps.validate_pr.outputs.pr-branch }}
           -Dsonar.pullrequest.base=${{ steps.validate_pr.outputs.pr-base }}
           -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }}
-
-      - name: Archive build artifacts
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: Build debug files
-          path: |
-            **/target/rat.txt
-            **/target/surefire-reports/*
-
-      - name: Surefire Report
-        # Pinned 3.5.2 version
-        uses: mikepenz/action-junit-report@16a9560bd02f11e7e3bf6b3e2ef6bba6c9d07c32
-        if: always()
-        with:
-          report_paths: '**/target/surefire-reports/TEST-*.xml'
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          detailed_summary: true
-          commit: ${{ github.event.workflow_run.head_sha }}
-          check_name: Sonar Build Test Report

.github/workflows/build.yml

@@ -43,8 +43,40 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-${{ github.workflow }}
 
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
       - name: Build with Maven
-        run: mvn clean compile test -fae -T 2 -B -V -DcloudBuild -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
+        run: mvn clean verify -fae -T 2 -B -V -DcloudBuild -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon
+        .httpconnectionManager.ttlSeconds=25
+
+      - name: Validate PR
+        id: validate_pr
+        # For whatever reason we get PR 69 for develop branch with both head and base as develop.
+        if: ${{ github.event.workflow_run.pull_requests[0].head.ref != github.event.workflow_run.pull_requests[0].base.ref }}
+        run: |
+          echo ":set-output pr-key=${{ github.event.workflow_run.pull_requests[0].number }}"
+          echo ":set-output pr-branch=${{ github.event.workflow_run.pull_requests[0].head.ref }}"
+          echo ":set-output pr-base=${{ github.event.workflow_run.pull_requests[0].base.ref }}"
+
+      - name: Sonar report
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+        run: >-
+          mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -fae -T 2 -B -V
+          -DcloudBuild
+          -Pcoverage
+          -Dmaven.wagon.http.retryHandler.count=3
+          -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
+          -Dsonar.pullrequest.key=${{ steps.validate_pr.outputs.pr-key }}
+          -Dsonar.pullrequest.branch=${{ steps.validate_pr.outputs.pr-branch }}
+          -Dsonar.pullrequest.base=${{ steps.validate_pr.outputs.pr-base }}
+          -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }}
 
       - name: Archive build artifacts
         uses: actions/upload-artifact@v3

pom.xml

@@ -65,7 +65,7 @@
     <jacoco.version>0.8.8</jacoco.version>
 
     <sonar.organization>data-integrations</sonar.organization>
-    <sonar.projectKey>data-integrations_${project.artifactId}</sonar.projectKey>
+    <sonar.projectKey>${sonar.organization}_${project.artifactId}</sonar.projectKey>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <sonar.coverage.jacoco.xmlReportPaths>
       ${maven.multiModuleProjectDirectory}/delta-coverage/target/site/jacoco-aggregate/jacoco.xml