Refactor : optimized the jacoco workflow (#33748)

apache · Nov 21, 2024 · c95c2dc · c95c2dc
1 parent e9f1b4b
commit c95c2dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/resources/scripts/unit-test-coverage-merge/code-coverage-merge.sh b/.github/workflows/resources/scripts/unit-test-coverage-merge/code-coverage-merge.sh
@@ -90,6 +90,7 @@ done
 # delete the build/libs/groovy.jar file, this will include useless packages
 find . -type f -regex '.*/groovy.jar' -exec rm -f {} +
 find . -type d -regex '.*/autogen/*' -exec rm -rf {} +
+find . -type d -regex './test/*' -exec rm -rf {} +
 
 echo "Copy Success, the compilation merge output folder is located at: $classOutPutDir"
 echo "Start generating overall coverage reports"

diff --git a/.github/workflows/schedule-report.yml b/.github/workflows/schedule-report.yml
@@ -76,10 +76,9 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
-          key: shardingsphere-maven-third-party-e2e-cache-${{ github.sha }}
+          key: ${{ needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            shardingsphere-maven-third-party-e2e-cache-
-            shardingsphere-maven-third-party-
+            ${{ needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}-maven-third-party-
       - name: Install Project
         run: ./mvnw clean install -DskipTests -T1C
       - name: Set up JDK 8 for Jacoco
@@ -89,7 +88,7 @@ jobs:
           java-version: 8
       - name: Build with maven and execute jacoco aggregation script
         run: |
-          ./mvnw --show-version --batch-mode --no-transfer-progress verify -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false &&
+          ./mvnw -V -B -ntp verify -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false &&
           chmod +x ./.github/workflows/resources/scripts/unit-test-coverage-merge/code-coverage-merge.sh &&
           ./.github/workflows/resources/scripts/unit-test-coverage-merge/code-coverage-merge.sh ${{ github.workspace }}
       - name: Upload coverage reports to codecov