Skip to content

Commit 8e7112d

Browse files
committed
fix(ci): use single JDK 25 for all builds
1 parent b17cd40 commit 8e7112d

1 file changed

Lines changed: 7 additions & 20 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,18 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616

17-
- name: Set up JDK 21 (for Atmosphere Maven build)
17+
- name: Set up JDK 25
1818
uses: actions/setup-java@v4
1919
with:
20-
java-version: 21
21-
distribution: 'temurin'
20+
java-version: 25
21+
distribution: 'oracle'
2222

2323
- name: Build Atmosphere (dependency)
2424
run: |
2525
git clone --depth 1 https://github.com/Atmosphere/atmosphere.git /tmp/atmosphere
2626
cd /tmp/atmosphere
2727
./mvnw -B install -Pfastinstall -pl modules/cpr,modules/spring-boot-starter -am
2828
29-
- name: Set up JDK 25 (for JavaClaw + plugin)
30-
uses: actions/setup-java@v4
31-
with:
32-
java-version: 25
33-
distribution: 'oracle'
34-
3529
- name: Build JavaClaw base (dependency)
3630
run: |
3731
git clone --depth 1 https://github.com/jobrunr/JavaClaw.git /tmp/JavaClaw
@@ -63,24 +57,18 @@ jobs:
6357
steps:
6458
- uses: actions/checkout@v4
6559

66-
- name: Set up JDK 21
60+
- name: Set up JDK 25
6761
uses: actions/setup-java@v4
6862
with:
69-
java-version: 21
70-
distribution: 'temurin'
63+
java-version: 25
64+
distribution: 'oracle'
7165

7266
- name: Build Atmosphere
7367
run: |
7468
git clone --depth 1 https://github.com/Atmosphere/atmosphere.git /tmp/atmosphere
7569
cd /tmp/atmosphere
7670
./mvnw -B install -Pfastinstall -pl modules/cpr,modules/spring-boot-starter -am
7771
78-
- name: Set up JDK 25
79-
uses: actions/setup-java@v4
80-
with:
81-
java-version: 25
82-
distribution: 'oracle'
83-
8472
- name: Build JavaClaw with Atmosphere plugin
8573
run: |
8674
git clone --depth 1 https://github.com/jobrunr/JavaClaw.git /tmp/JavaClaw
@@ -108,9 +96,8 @@ jobs:
10896
# Add atmosphere config
10997
sed -i '/^management:/i atmosphere:\n servlet-path: /atmosphere/*\n broadcaster-cache-class: org.atmosphere.cache.UUIDBroadcasterCache\n' app/src/main/resources/application.yaml
11098
111-
# Boot the app
99+
# Boot the app in background
112100
./gradlew :app:bootRun &
113-
BOOT_PID=$!
114101
115102
# Wait for startup
116103
for i in $(seq 1 60); do

0 commit comments

Comments
 (0)