Skip to content

Commit 80d8be4

Browse files
committed
Clean up CI setup - remove JDK 11 as latest WFLY versions don't even start with it. Perform base build with 17 and testing with 17/21/25
1 parent 7d0523a commit 80d8be4

File tree

1 file changed

+16
-28
lines changed

1 file changed

+16
-28
lines changed

.github/workflows/ci-actions.yml

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ on:
1212

1313
jobs:
1414
# builds Weld snapshot, downloads WFLY and upgrades it, prepares ENV variable
15-
build-jdk11:
16-
name: "Initial JDK 11 Weld Build + WildFly patch"
15+
initial-build:
16+
name: "Initial JDK 17 Weld Build + WildFly patch"
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Set up JDK
2121
uses: actions/[email protected]
2222
with:
23-
java-version: 11
23+
java-version: 17
2424
distribution: 'temurin'
2525
- name: Download WildFly
2626
run: |
@@ -74,15 +74,12 @@ jobs:
7474
incontainer-tests:
7575
name: "Weld In-container Tests - JDK ${{matrix.java.name}}"
7676
runs-on: ubuntu-latest
77-
needs: build-jdk11
77+
needs: initial-build
7878
timeout-minutes: 120
7979
strategy:
8080
fail-fast: false
8181
matrix:
8282
java:
83-
- { name: "11",
84-
java-version: 11,
85-
}
8683
- {
8784
name: "17",
8885
java-version: 17,
@@ -145,15 +142,12 @@ jobs:
145142
CDI-TCK:
146143
name: "CDI TCK - JDK ${{matrix.java.name}}"
147144
runs-on: ubuntu-latest
148-
needs: build-jdk11
145+
needs: initial-build
149146
timeout-minutes: 120
150147
strategy:
151148
fail-fast: false
152149
matrix:
153150
java:
154-
- { name: "11",
155-
java-version: 11,
156-
}
157151
- {
158152
name: "17",
159153
java-version: 17,
@@ -216,7 +210,7 @@ jobs:
216210
relaxed-mode-test:
217211
name: "Relaxed mode testing - JDK ${{matrix.java.name}}"
218212
runs-on: ubuntu-latest
219-
needs: build-jdk11
213+
needs: initial-build
220214
timeout-minutes: 120
221215
strategy:
222216
fail-fast: false
@@ -288,15 +282,12 @@ jobs:
288282
no-container-tests:
289283
name: "Weld Tests w/o Container - JDK ${{matrix.java.name}}"
290284
runs-on: ubuntu-latest
291-
needs: build-jdk11
285+
needs: initial-build
292286
timeout-minutes: 120
293287
strategy:
294288
fail-fast: false
295289
matrix:
296290
java:
297-
- { name: "11",
298-
java-version: 11,
299-
}
300291
- {
301292
name: "17",
302293
java-version: 17,
@@ -338,18 +329,18 @@ jobs:
338329
name: test-reports-no-container-jdk${{matrix.java.name}}
339330
path: 'test-reports.tgz'
340331

341-
# Weld Examples build and test, only JDK 11
332+
# Weld Examples build and test, only one JDK
342333
examples-tests:
343-
name: "Weld Examples build and test - JDK 11}"
334+
name: "Weld Examples build and test - JDK 17}"
344335
runs-on: ubuntu-latest
345-
needs: build-jdk11
336+
needs: initial-build
346337
timeout-minutes: 120
347338
steps:
348339
- uses: actions/checkout@v4
349-
- name: Set up JDK 11
340+
- name: Set up JDK
350341
uses: actions/[email protected]
351342
with:
352-
java-version: 11
343+
java-version: 17
353344
distribution: 'temurin'
354345
- name: Download Maven Repo
355346
uses: actions/download-artifact@v4
@@ -394,15 +385,12 @@ jobs:
394385
CDI-TCK-SE:
395386
name: "CDI TCK SE - JDK ${{matrix.java.name}}"
396387
runs-on: ubuntu-latest
397-
needs: build-jdk11
388+
needs: initial-build
398389
timeout-minutes: 120
399390
strategy:
400391
fail-fast: false
401392
matrix:
402393
java:
403-
- { name: "11",
404-
java-version: 11,
405-
}
406394
- {
407395
name: "17",
408396
java-version: 17,
@@ -448,14 +436,14 @@ jobs:
448436
weld-se-servlet-coop:
449437
name: "Weld SE-Servlet Cooperation"
450438
runs-on: ubuntu-latest
451-
needs: build-jdk11
439+
needs: initial-build
452440
timeout-minutes: 20
453441
steps:
454442
- uses: actions/checkout@v4
455-
- name: Set up JDK 11
443+
- name: Set up JDK
456444
uses: actions/[email protected]
457445
with:
458-
java-version: 11
446+
java-version: 17
459447
distribution: 'temurin'
460448
- name: Download Maven Repo
461449
uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)