Move Sonar to common build

aim42 · Aug 13, 2024 · 74e60ef · 74e60ef
1 parent 83ddef5
commit 74e60ef
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
@@ -6,6 +6,10 @@ on:
         required: true
         type: string
         default: '17'
+      run-sonar:
+        required: false
+        type: boolean
+        default: false
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -44,6 +48,23 @@ jobs:
       - name: Execute Gradle build
         run: ./gradlew clean check integrationTest --scan --stacktrace
 
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v4
+        if: ${{ inputs.run-sonar }}
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Analyze with SonarCloud
+        if: ${{ inputs.run-sonar }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          BRANCH_NAME=${GITHUB_REF#refs/heads/}
+          ./gradlew sonar -Psonar.branch.name=${BRANCH_NAME} --info --scan
+
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -11,6 +11,7 @@ jobs:
     uses: ./.github/workflows/build-artifacts.yml
     with:
       java-version: '17'
+      run-sonar: true
 
   post-build:
     needs: build-artifacts
@@ -45,21 +46,6 @@ jobs:
         with:
           workflow: test-java-os-mix.yml
 
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-
-      - name: Analyze with SonarCloud
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          BRANCH_NAME=${GITHUB_REF#refs/heads/}
-          ./gradlew sonar -Psonar.branch.name=${BRANCH_NAME} --info --scan
-
       - name: Collect state upon failure
         if: failure()
         run: |