fixup! fixup! [CI] Activate dedicated Sonar GitHub action

Philzen · Jun 9, 2024 · 4895e3a · 4895e3a
1 parent 895c3dd
commit 4895e3a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml
@@ -1,31 +1,30 @@
 name: SonarCloud
 on:
-  workflow_run:
-    workflows: [Build]
-    types: [completed]
+  workflow_call:
+    inputs: {}
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
-  build:
+  analyze:
     name: Analyze
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu' # Alternative distribution options are available.
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -34,7 +33,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: code-coverage-jacoco-xml
-      - name: Build and analyze
+      - name: Analyze project
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,13 +47,15 @@ jobs:
             --batch-mode
         run: mvn ${{ env.MAVEN_SWITCHES }} -P coverage jacoco:prepare-agent verify jacoco:report
 
-        # Upload JaCoCo XML report as artifact
-        # https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts#uploading-build-and-test-artifacts
-      - name: Upload code coverage results
-        uses: actions/upload-artifact@v4
-        with:
-          name: code-coverage-jacoco-xml
-          path: target/site/jacoco/jacoco.xml
+      - name: Analyze project
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          MAVEN_OPTS: >-
+            -Dsonar.projectKey=Philzen_rewrite-recipe-testng-to-junit-jupiter
+            -Dsonar.organization=philzen
+            -Dsonar.host.url=https://sonarcloud.io
+        run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
 
   publish-snapshots:
     needs: [build]