Skip to content

Commit 5261a72

Browse files
committed
[UNDERTOW-2103] Rename matrix.ssl to matrix.openssl and, for ipv6 tests, enable openssl when not running in proxy mode.
Because tests running in standard mode are redundant with a part of proxy mode, it is a good approach to run one of them in openssl mode so we can have a glimpse of whether we have failures involving openssl with ipv6. Signed-off-by: Flavia Rainone <[email protected]>
1 parent e4db276 commit 5261a72

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
**/surefire*-reports/*.txt
5353
**/*.dump*
5454
test-matrix:
55-
name: JDK ${{ matrix.jdk }} - ${{ matrix.module }} - ${{ matrix.os }} ${{ matrix.ssl && '- openssl' || '' }}
55+
name: JDK ${{ matrix.jdk }} - ${{ matrix.module }} - ${{ matrix.os }} ${{ matrix.openssl && '- openssl' || '' }}
5656
runs-on: ${{ matrix.os }}
5757
needs: build-all
5858
strategy:
@@ -62,7 +62,7 @@ jobs:
6262
module: [core]
6363
jdk: [17, 21]
6464
openjdk_impl: [ temurin ]
65-
ssl: [false, true]
65+
openssl: [false, true]
6666
steps:
6767
- name: Update hosts - linux
6868
if: matrix.os == 'ubuntu-latest'
@@ -105,7 +105,7 @@ jobs:
105105
- name: Print Version
106106
run: mvn -v
107107
- name: Run Tests
108-
run: mvn -U -B -fae test -Pproxy '-Dopenssl=${{ matrix.ssl }} -DfailIfNoTests=false' -pl ${{ matrix.module }}
108+
run: mvn -U -B -fae test -Pproxy '-Dopenssl=${{ matrix.openssl }} -DfailIfNoTests=false' -pl ${{ matrix.module }}
109109
- uses: actions/upload-artifact@v4
110110
if: failure()
111111
with:
@@ -114,7 +114,7 @@ jobs:
114114
**/surefire*-reports/*.txt
115115
**/*.dump*
116116
test-matrix-ipv6:
117-
name: JDK ${{ matrix.jdk }} - ipv6 - ${{ matrix.module }} ${{ matrix.proxy }} - ${{ matrix.os }}
117+
name: JDK ${{ matrix.jdk }} - ipv6 - ${{ matrix.module }} ${{ matrix.proxy && '- proxy' || '' }} - ${{ matrix.os }}
118118
runs-on: ${{ matrix.os }}
119119
needs: build-all
120120
strategy:
@@ -157,7 +157,7 @@ jobs:
157157
- name: Print Version
158158
run: mvn -v
159159
- name: Run Tests
160-
run: mvn -U -B -fae test ${{ matrix.proxy }} '-DfailIfNoTests=false' -pl ${{ matrix.module }} -Dtest.ipv6=true
160+
run: mvn -U -B -fae test ${{ matrix.proxy && '-Pproxy' || '-Dopenssl=true' }} '-DfailIfNoTests=false' -pl ${{ matrix.module }} -Dtest.ipv6=true
161161
- uses: actions/upload-artifact@v4
162162
if: failure()
163163
with:

0 commit comments

Comments
 (0)