From 9648c1645ed46295a0b2a0da70e1e0bfa7639ea5 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 18 Jan 2025 12:38:12 +0000 Subject: [PATCH 1/4] Cleanup github workflows add latest JDK --- .github/workflows/build.yml | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38fb2d6f3b9d..ab65e6f1ea9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,6 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'gradle' native-image-job-reports: true - components: 'native-image' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -372,7 +371,6 @@ jobs: runs-on: ubuntu-latest if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdkversions') || contains(github.event.pull_request.labels.*.name, 'renovate') - steps: - name: Checkout uses: actions/checkout@v4 @@ -403,6 +401,40 @@ jobs: - name: Run Checks run: ./gradlew test -Dtest.java.version=21 + testopenjdklatest: + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdkversions') || contains(github.event.pull_request.labels.*.name, 'renovate') + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 11 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 23 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 17 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Run Checks + run: ./gradlew test -Dtest.java.version=23 + testwindows: runs-on: windows-latest # TODO add master build after fixing all tests in CI @@ -462,7 +494,6 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'gradle' native-image-job-reports: true - components: 'native-image' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 From 657012cc8a33839a60005006e87250e1bea5a948 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 18 Jan 2025 12:39:49 +0000 Subject: [PATCH 2/4] Cleanup github workflows add latest JDK --- .github/workflows/build.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab65e6f1ea9c..ef200a2f86b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -435,6 +435,40 @@ jobs: - name: Run Checks run: ./gradlew test -Dtest.java.version=23 + testopenjdkearlyaccess: + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdkversions') || contains(github.event.pull_request.labels.*.name, 'renovate') + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 11 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 24-ea + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 17 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Run Checks + run: ./gradlew test -Dtest.java.version=24 + testwindows: runs-on: windows-latest # TODO add master build after fixing all tests in CI From 257484f8fd33716c3778c9030502a80c2c4a6dee Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 18 Jan 2025 12:44:59 +0000 Subject: [PATCH 3/4] Cleanup github workflows add latest JDK --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef200a2f86b8..af6f867a99f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -454,7 +454,7 @@ jobs: - name: Configure JDK uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'temurin' java-version: 24-ea - name: Configure JDK From cb5e418679cf247d96dd367b85b3bc37664ed435 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 18 Jan 2025 12:57:48 +0000 Subject: [PATCH 4/4] more tolerant of error messages --- .../src/test/java/okhttp3/logging/LoggingEventListenerTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/okhttp-logging-interceptor/src/test/java/okhttp3/logging/LoggingEventListenerTest.kt b/okhttp-logging-interceptor/src/test/java/okhttp3/logging/LoggingEventListenerTest.kt index 361ccd1cd973..014bf7a0623b 100644 --- a/okhttp-logging-interceptor/src/test/java/okhttp3/logging/LoggingEventListenerTest.kt +++ b/okhttp-logging-interceptor/src/test/java/okhttp3/logging/LoggingEventListenerTest.kt @@ -225,12 +225,12 @@ class LoggingEventListenerTest { .assertLogMatch(Regex("""secureConnectStart""")) .assertLogMatch( Regex( - """connectFailed: null \S+(?:SSLProtocolException|SSLHandshakeException|TlsFatalAlert): (?:Unexpected handshake message: client_hello|Handshake message sequence violation, 1|Read error|Handshake failed|unexpected_message\(10\)).*""", + """connectFailed: null \S+(?:SSLProtocolException|SSLHandshakeException|TlsFatalAlert): .*(?:Unexpected handshake message: client_hello|Handshake message sequence violation, 1|Read error|Handshake failed|unexpected_message\(10\)).*""", ), ) .assertLogMatch( Regex( - """callFailed: \S+(?:SSLProtocolException|SSLHandshakeException|TlsFatalAlert): (?:Unexpected handshake message: client_hello|Handshake message sequence violation, 1|Read error|Handshake failed|unexpected_message\(10\)).*""", + """callFailed: \S+(?:SSLProtocolException|SSLHandshakeException|TlsFatalAlert): .*(?:Unexpected handshake message: client_hello|Handshake message sequence violation, 1|Read error|Handshake failed|unexpected_message\(10\)).*""", ), ) .assertNoMoreLogs()