Skip to content

Commit ff2bdd6

Browse files
authored
Merge pull request #26 from fl4via/UNDERTOW-2103
[UNDERTOW-2103][UNDERTOW-2644] Enable openssl tests in CI and upgrade openssl to 2.2.5.Final
2 parents 84b5ece + ebeb6f0 commit ff2bdd6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
**/surefire*-reports/*.txt
6565
**/*.dump*
6666
test-matrix:
67-
name: JDK ${{ matrix.jdk }} - ${{ matrix.module }} - ${{ matrix.os }}
67+
name: JDK ${{ matrix.jdk }} - ${{ matrix.module }} - ${{ matrix.os }} ${{ matrix.openssl && '- openssl' || '' }}
6868
runs-on: ${{ matrix.os }}
6969
needs: build-all
7070
strategy:
@@ -74,6 +74,7 @@ jobs:
7474
module: [servlet, websockets]
7575
jdk: [17, 21, 25]
7676
openjdk_impl: [ temurin ]
77+
openssl: [false, true]
7778
steps:
7879
- name: Update hosts - linux
7980
if: matrix.os == 'ubuntu-latest'
@@ -113,7 +114,7 @@ jobs:
113114
- name: Print Version
114115
run: mvn -v
115116
- name: Run Tests
116-
run: mvn -U -B -fae test -Pproxy '-DfailIfNoTests=false' -pl ${{ matrix.module }}
117+
run: mvn -U -B -fae test -Pproxy '-Dopenssl=${{ matrix.openssl }} -DfailIfNoTests=false' -pl ${{ matrix.module }}
117118
- uses: actions/upload-artifact@v4
118119
if: failure()
119120
with:
@@ -122,7 +123,7 @@ jobs:
122123
**/surefire*-reports/*.txt
123124
**/*.dump*
124125
test-matrix-ipv6:
125-
name: JDK ${{ matrix.jdk }} - ipv6 - ${{ matrix.module }} ${{ matrix.proxy }} - ${{ matrix.os }}
126+
name: JDK ${{ matrix.jdk }} - ipv6 - ${{ matrix.module }} ${{ matrix.proxy && '- proxy' || '' }} - ${{ matrix.os }}
126127
runs-on: ${{ matrix.os }}
127128
timeout-minutes: 90
128129
needs: build-all
@@ -163,7 +164,7 @@ jobs:
163164
- name: Print Version
164165
run: mvn -v
165166
- name: Run Tests
166-
run: mvn -U -B -fae test ${{ matrix.proxy }} '-DfailIfNoTests=false' -pl ${{ matrix.module }} -Dtest.ipv6=true
167+
run: mvn -U -B -fae test ${{ matrix.proxy && '-Pproxy' || '' }} '-DfailIfNoTests=false' -pl ${{ matrix.module }} -Dtest.ipv6=true
167168
- uses: actions/upload-artifact@v4
168169
if: failure()
169170
with:

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
<version.com.github.spotbugs-maven-plugin>4.7.3.4</version.com.github.spotbugs-maven-plugin>
164164

165165
<!-- Non-default maven plugin versions and configuration -->
166-
<version.org.wildfly.openssl>2.2.1.Final</version.org.wildfly.openssl>
166+
<version.org.wildfly.openssl>2.2.5.Final</version.org.wildfly.openssl>
167167
<version.bundle.plugin>5.1.1</version.bundle.plugin>
168168

169169
<maven.compiler.release>17</maven.compiler.release>

0 commit comments

Comments
 (0)