Add a CI build for JDK 19 (square#7614)

frojasg · Jan 2, 2023 · 7287352 · 7287352
1 parent f41dfed
commit 7287352
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -151,7 +151,7 @@ jobs:
 
   testopenjdk8:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdk8')
+    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdkversions')
 
     steps:
       - name: Checkout
@@ -172,7 +172,7 @@ jobs:
 
   testopenjdk8alpn:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdk8')
+    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdkversions')
 
     steps:
       - name: Checkout
@@ -284,7 +284,7 @@ jobs:
 
   testopenjdk17:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdk17')
+    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdkversions')
 
     steps:
       - name: Checkout
@@ -303,6 +303,33 @@ jobs:
         with:
           arguments: jvmTest -Dtest.java.version=17
 
+  testopenjdk19:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdkversions')
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 19
+
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 11
+
+      - name: Run Checks
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: jvmTest -Dtest.java.version=19
+
   testwindows:
     runs-on: windows-latest
     # TODO add master build after fixing all tests in CI

diff --git a/samples/compare/src/test/kotlin/okhttp3/compare/JavaHttpClientTest.kt b/samples/compare/src/test/kotlin/okhttp3/compare/JavaHttpClientTest.kt
@@ -22,6 +22,7 @@ import java.net.http.HttpClient.Redirect.NORMAL
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse.BodyHandlers
 import okhttp3.testing.PlatformRule
+import okhttp3.testing.PlatformVersion
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
@@ -60,7 +61,9 @@ class JavaHttpClientTest {
       assertThat(recorded.headers["Accept"]).isEqualTo("text/plain")
       assertThat(recorded.headers["Accept-Encoding"]).isNull() // No built-in gzip.
       assertThat(recorded.headers["Connection"]).isEqualTo("Upgrade, HTTP2-Settings")
-      assertThat(recorded.headers["Content-Length"]).isEqualTo("0")
+      if (PlatformVersion.majorVersion >= 19) {
+        assertThat(recorded.headers["Content-Length"]).isEqualTo("0")
+      }
       assertThat(recorded.headers["HTTP2-Settings"]).isNotNull()
       assertThat(recorded.headers["Upgrade"]).isEqualTo("h2c") // HTTP/2 over plaintext!
       assertThat(recorded.headers["User-Agent"]).matches("Java-http-client/.*")