From 57a1f979636a7758394b7b0505d6ff712fe3bf90 Mon Sep 17 00:00:00 2001
From: ReaJason <reajason1225@gmail.com>
Date: Mon, 9 Dec 2024 23:06:03 +0800
Subject: [PATCH] ci: coverage run failed

---
 .github/workflows/ci.yaml | 16 +++++++++++++---
 build.gradle              |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 896aa8ec..0ff58f42 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -48,7 +48,7 @@ jobs:
   integration-test:
     strategy:
       matrix:
-        middleware: [ "Tomcat", "Jetty" ]
+        middleware: [ "tomcat", "jetty" ]
     runs-on: ubuntu-latest
     name: ${{ matrix.middleware }}
     needs: [ build, unit-test ]
@@ -63,14 +63,15 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Integration Test with gradle
-        run: ./gradlew :integration-test:test --tests '${{ matrix.middleware }}*'
+        run: ./gradlew :integration-test:test --tests '*.${{ matrix.middleware }}.*'
       - name: Export Integration Test Summary
         run: cat integration-test/build/test-results/report.md >> $GITHUB_STEP_SUMMARY
       - name: Upload jacoco
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.middleware }}
+          name: ${{ matrix.middleware }}-integration-test
           path: integration-test/build/jacoco/test.exec
+          retention-days: 1
   coverage:
     name: Coverage
     needs: [ build, unit-test, integration-test ]
@@ -82,6 +83,15 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: integration-test/build/jacoco
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Merge Jacoco
         run: ./gradlew :jacocoTestReport
       - name: Generate JaCoCo Badge
diff --git a/build.gradle b/build.gradle
index 14f77d20..b6711f5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ jacocoTestReport {
     }
     afterEvaluate {
         executionData.from fileTree(rootDir) {
-            include '**/build/jacoco/*.exec'
+            include '**/build/jacoco/**/*.exec'
         }
 
         sourceDirectories = files('generator/src/main/java')