Skip to content

Commit 74fa41b

Browse files
authored
Merge pull request #1933 from arunvenmany-ibm/java25_it
adding java 25 to github workflow
2 parents ea54c74 + fa023ea commit 74fa41b

File tree

1 file changed

+38
-10
lines changed

1 file changed

+38
-10
lines changed

.github/workflows/maven.yml

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,27 @@ jobs:
2222
matrix:
2323
# test against latest update of each major Java version, as well as specific updates of LTS versions:
2424
RUNTIME: [ol, wlp]
25-
RUNTIME_VERSION: [25.0.0.6]
26-
java: [21, 17, 11, 8]
25+
RUNTIME_VERSION: [25.0.0.9,25.0.0.10]
26+
java: [25, 21, 17, 11, 8]
2727
exclude:
2828
- java: 8
2929
RUNTIME: wlp
30+
- java: 17
31+
RUNTIME: wlp
3032
- java: 11
3133
RUNTIME: ol
34+
- java: 21
35+
RUNTIME: ol
36+
- RUNTIME_VERSION: 25.0.0.9
37+
java: 25
38+
- RUNTIME_VERSION: 25.0.0.10
39+
java: 21
40+
- RUNTIME_VERSION: 25.0.0.10
41+
java: 17
42+
- RUNTIME_VERSION: 25.0.0.10
43+
java: 11
44+
- RUNTIME_VERSION: 25.0.0.10
45+
java: 8
3246
name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Linux
3347
steps:
3448
# Checkout repos
@@ -66,7 +80,7 @@ jobs:
6680
./mvnw -V clean install -f ci.common --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
6781
# Run tests that require a minimum of Java 17 or later
6882
- name: Run tests that require a minimum of Java 17 or later
69-
if: ${{ matrix.java == '17' || matrix.java == '21'}}
83+
if: ${{ matrix.java != '8' && matrix.java != '11'}}
7084
run: ./mvnw -V verify --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -Ponline-its -D"invoker.streamLogsOnFailures"=true -D"invoker.test"="*setup*,*springboot-3-*,*compile-jsp-source-17-*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
7185
# Run tests
7286
- name: Run tests
@@ -80,13 +94,27 @@ jobs:
8094
matrix:
8195
# test against latest update of each major Java version, as well as specific updates of LTS versions:
8296
RUNTIME: [ol, wlp]
83-
RUNTIME_VERSION: [25.0.0.6]
84-
java: [21, 17, 11, 8]
97+
RUNTIME_VERSION: [ 25.0.0.9,25.0.0.10 ]
98+
java: [ 25, 21, 17, 11, 8 ]
8599
exclude:
86-
- java: 8
87-
RUNTIME: ol
88-
- java: 11
89-
RUNTIME: wlp
100+
- java: 8
101+
RUNTIME: wlp
102+
- java: 17
103+
RUNTIME: wlp
104+
- java: 11
105+
RUNTIME: ol
106+
- java: 21
107+
RUNTIME: ol
108+
- RUNTIME_VERSION: 25.0.0.9
109+
java: 25
110+
- RUNTIME_VERSION: 25.0.0.10
111+
java: 21
112+
- RUNTIME_VERSION: 25.0.0.10
113+
java: 17
114+
- RUNTIME_VERSION: 25.0.0.10
115+
java: 11
116+
- RUNTIME_VERSION: 25.0.0.10
117+
java: 8
90118
name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Windows
91119
steps:
92120
# Checkout repos
@@ -119,7 +147,7 @@ jobs:
119147
# Run tests that require a minimum of Java 17 or later
120148
- name: Run tests that require a minimum of Java 17 or later
121149
working-directory: ${{github.workspace}}
122-
if: ${{ matrix.java == '17' || matrix.java == '21'}}
150+
if: ${{ matrix.java != '8' && matrix.java != '11'}}
123151
run: .\mvnw.cmd -V verify -Ponline-its --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -D"invoker.streamLogsOnFailures"=true -D"invoker.test"="*setup*,*springboot-3-*,*compile-jsp-source-17-*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
124152
# Run tests
125153
- name: Run tests

0 commit comments

Comments
 (0)