Merge pull request #15712 from cdapio/fix-sonar-report-build

fix sonar report build
cdapio · Sep 25, 2024 · 9acc948 · 9acc948
2 parents fded74b + 3e49d89
commit 9acc948
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/build-sonar-report.yml b/.github/workflows/build-sonar-report.yml
@@ -37,7 +37,7 @@ jobs:
         submodules: recursive
 
      - name: Cache SonarCloud packages
-       uses: actions/cache@v3
+       uses: actions/cache@v4
        with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
@@ -50,9 +50,10 @@ jobs:
         run-id: ${{ github.event.workflow_run.id }}
         path: artifacts/
 
-     - name: Copy coverage report
+     - name: Copy downloaded artifacts
        run: |
         cp -r artifacts/reports-${{ github.event.workflow_run.id }}/* /tmp/cdap/cdap/
+        rm -rf artifacts/
 
      - name: Sonar Report on PR
        # For whatever reason we get PR 69 for develop branch with both head and base as develop.

diff --git a/.github/workflows/build-sonar.yml b/.github/workflows/build-sonar.yml
@@ -38,11 +38,11 @@ jobs:
          )
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository11
           key: ${{ runner.os }}-maven-${{ github.workflow }}-${{ hashFiles('**/pom.xml') }}
@@ -64,5 +64,8 @@ jobs:
           path: |
             **/target/rat.txt
             **/target/surefire-reports/*
+            **/target/generated-test-sources/*
             **/target/generated-sources/*
+            **/target/classes/*
+            **/target/test-classes/*
             **/target/site/*