Skip to content

Commit 5b87f04

Browse files
committed
ci(workflows): 优化CI测试流程以支持多JDK版本
- 移除冗余的hotspot-jdk-ci和minimum-jdk-ci任务 - 合并为统一的test-jdk-ci任务支持JDK 8、17和21 - 针对JDK 8使用特定模块测试命令 - 为JDK 11及以上版本启用并行测试执行 - 简化Gradle构建配置提高CI效率
1 parent 4584069 commit 5b87f04

1 file changed

Lines changed: 8 additions & 25 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ jobs:
4949
- name: Build Spring Boot Starter 3 test with Gradle
5050
run: |
5151
./gradlew :dynamic-datasource-spring-boot3-starter:nativeTest --no-daemon
52-
test-hotspot-jdk-ci:
52+
test-jdk-ci:
5353
name: Test CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
5454
runs-on: ${{ matrix.os }}
5555
timeout-minutes: 30
5656
strategy:
5757
matrix:
5858
os: [ ubuntu-latest ]
59-
java-version: [ '17', '21' ]
59+
java-version: [ '8', '17', '21' ]
6060
steps:
6161
- uses: actions/checkout@v4
6262
- name: Setup java
@@ -65,28 +65,11 @@ jobs:
6565
distribution: 'temurin'
6666
java-version: ${{ matrix.java-version }}
6767
cache: 'gradle'
68-
- name: Build test with Gradle
68+
- name: Build test with Gradle (JDK 8)
69+
if: matrix.java-version == '8'
6970
run: |
70-
./gradlew clean test --no-daemon --parallel
71-
test-minimum-jdk-ci:
72-
name: Test CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
73-
runs-on: ${{ matrix.os }}
74-
timeout-minutes: 30
75-
strategy:
76-
matrix:
77-
os: [ ubuntu-latest ]
78-
java-version: [ '8' ]
79-
steps:
80-
- uses: actions/checkout@v4
81-
- name: Setup java
82-
uses: actions/setup-java@v4
83-
with:
84-
distribution: 'temurin'
85-
java-version: ${{ matrix.java-version }}
86-
cache: 'gradle'
87-
- name: Build test with Gradle
88-
run: |
89-
./gradlew :dynamic-datasource-creator:clean :dynamic-datasource-creator:test --no-daemon
90-
./gradlew :dynamic-datasource-spring:clean :dynamic-datasource-spring:test --no-daemon
91-
./gradlew :dynamic-datasource-spring-boot-common:clean :dynamic-datasource-spring-boot-common:test --no-daemon
9271
./gradlew :dynamic-datasource-spring-boot-starter:clean :dynamic-datasource-spring-boot-starter:test --no-daemon
72+
- name: Build test with Gradle (JDK 11+)
73+
if: matrix.java-version != '8'
74+
run: |
75+
./gradlew clean test --no-daemon --parallel

0 commit comments

Comments
 (0)