Skip to content

Commit 81932a1

Browse files
authored
build: Include nightly tests on JDK 24 (#32779)
* build: Nightly tests on JDK 24 * Skip test using RSA cipher suite on Java 24 * test Scala 3 build on JDK 24 as well * one more TLS related test
1 parent 0ad5489 commit 81932a1

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/nightly-builds.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ jobs:
9696
- { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '' }
9797
- { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '' }
9898
- { scalaVersion: "2.13", jdkVersion: "1.21.0", jvmName: "temurin:1.21", extraOpts: '' }
99+
- { scalaVersion: "2.13", jdkVersion: "1.24.0", jvmName: "temurin:1.24", extraOpts: '' }
99100

100101
# { scalaVersion: "3.3", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '' }
101102
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '' }
103+
- { scalaVersion: "3.3", jdkVersion: "1.24.0", jvmName: "temurin:1.24", extraOpts: '' }
102104
steps:
103105
- name: Checkout
104106
# https://github.com/actions/checkout/releases

akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ class TcpSpec extends StreamSpec("""
953953
val engine = sslContext.createSSLEngine()
954954

955955
engine.setUseClientMode(role == akka.stream.Client)
956-
engine.setEnabledCipherSuites(Array("TLS_RSA_WITH_AES_128_CBC_SHA"))
956+
engine.setEnabledCipherSuites(Array("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"))
957957
engine.setEnabledProtocols(Array("TLSv1.2"))
958958

959959
engine

akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,11 +392,9 @@ class TlsSpec extends StreamSpec(TlsSpec.configOverrides) with WithLogCapturing
392392
LHSIgnoresBoth,
393393
BothSidesIgnoreBoth) ++
394394
(if (protocol == "TLSv1.2")
395-
Seq(
396-
SessionRenegotiationBySender,
397-
SessionRenegotiationByReceiver,
398-
SessionRenegotiationFirstOne,
399-
SessionRenegotiationFirstTwo)
395+
Seq(SessionRenegotiationBySender, SessionRenegotiationByReceiver, SessionRenegotiationFirstTwo) ++
396+
// RSA cipher suites disabled by default in JDK 24 and later
397+
(if (JavaVersion.majorVersion < 24) Seq(SessionRenegotiationFirstOne) else Nil)
400398
else // TLSv1.3 doesn't support renegotiation
401399
Nil)
402400

0 commit comments

Comments
 (0)