Skip to content

Commit 57a1f97

Browse files
committed
ci: coverage run failed
1 parent feb4dbe commit 57a1f97

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
integration-test:
4949
strategy:
5050
matrix:
51-
middleware: [ "Tomcat", "Jetty" ]
51+
middleware: [ "tomcat", "jetty" ]
5252
runs-on: ubuntu-latest
5353
name: ${{ matrix.middleware }}
5454
needs: [ build, unit-test ]
@@ -63,14 +63,15 @@ jobs:
6363
- name: Setup Gradle
6464
uses: gradle/actions/setup-gradle@v4
6565
- name: Integration Test with gradle
66-
run: ./gradlew :integration-test:test --tests '${{ matrix.middleware }}*'
66+
run: ./gradlew :integration-test:test --tests '*.${{ matrix.middleware }}.*'
6767
- name: Export Integration Test Summary
6868
run: cat integration-test/build/test-results/report.md >> $GITHUB_STEP_SUMMARY
6969
- name: Upload jacoco
7070
uses: actions/upload-artifact@v4
7171
with:
72-
name: ${{ matrix.middleware }}
72+
name: ${{ matrix.middleware }}-integration-test
7373
path: integration-test/build/jacoco/test.exec
74+
retention-days: 1
7475
coverage:
7576
name: Coverage
7677
needs: [ build, unit-test, integration-test ]
@@ -82,6 +83,15 @@ jobs:
8283
uses: actions/download-artifact@v4
8384
with:
8485
path: integration-test/build/jacoco
86+
- name: Checkout
87+
uses: actions/checkout@v4
88+
- name: Setup Java
89+
uses: actions/setup-java@v4
90+
with:
91+
distribution: 'temurin'
92+
java-version: 17
93+
- name: Setup Gradle
94+
uses: gradle/actions/setup-gradle@v4
8595
- name: Merge Jacoco
8696
run: ./gradlew :jacocoTestReport
8797
- name: Generate JaCoCo Badge

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jacocoTestReport {
2222
}
2323
afterEvaluate {
2424
executionData.from fileTree(rootDir) {
25-
include '**/build/jacoco/*.exec'
25+
include '**/build/jacoco/**/*.exec'
2626
}
2727

2828
sourceDirectories = files('generator/src/main/java')

0 commit comments

Comments
 (0)