From 36fd46c9606ade07cbaab4381d2de6aaead9b1dc Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Mon, 28 Oct 2024 09:37:20 -0700 Subject: [PATCH] Swap Zulu for Corretto. Recently we've been seeing segfaults in JDK 21 unit tests. This patch checks whether changing to an alternate JDK would be helpful. --- .github/workflows/codeql.yml | 2 +- .github/workflows/cron-job-its.yml | 4 ++-- .github/workflows/reusable-revised-its.yml | 2 +- .github/workflows/reusable-standard-its.yml | 2 +- .github/workflows/reusable-unit-tests.yml | 2 +- .github/workflows/standard-its.yml | 2 +- .github/workflows/static-checks.yml | 8 ++++---- .github/workflows/unit-and-integration-tests-unified.yml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7cfeb63cbff0..7efa7762fc78 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'corretto' java-version: '8' cache: 'maven' diff --git a/.github/workflows/cron-job-its.yml b/.github/workflows/cron-job-its.yml index aa3f28382884..8f725597c0b8 100644 --- a/.github/workflows/cron-job-its.yml +++ b/.github/workflows/cron-job-its.yml @@ -38,7 +38,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '8' - distribution: 'zulu' + distribution: 'corretto' - name: Cache Maven m2 repository id: maven @@ -123,7 +123,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '8' - distribution: 'zulu' + distribution: 'corretto' cache: maven - name: maven build # needed to rebuild incase of maven snapshot resolution fails diff --git a/.github/workflows/reusable-revised-its.yml b/.github/workflows/reusable-revised-its.yml index 1aa29f64cb5b..805ef921a7d9 100644 --- a/.github/workflows/reusable-revised-its.yml +++ b/.github/workflows/reusable-revised-its.yml @@ -94,7 +94,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: ${{ inputs.build_jdk }} - distribution: 'zulu' + distribution: 'corretto' - name: Restore Maven repository id: maven-restore diff --git a/.github/workflows/reusable-standard-its.yml b/.github/workflows/reusable-standard-its.yml index b9bb8bb2d560..01741f01e47d 100644 --- a/.github/workflows/reusable-standard-its.yml +++ b/.github/workflows/reusable-standard-its.yml @@ -66,7 +66,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: ${{ inputs.runtime_jdk }} - distribution: 'zulu' + distribution: 'corretto' - name: Restore Maven repository id: maven-restore diff --git a/.github/workflows/reusable-unit-tests.yml b/.github/workflows/reusable-unit-tests.yml index fe55e563b2dd..b810d1b8279c 100644 --- a/.github/workflows/reusable-unit-tests.yml +++ b/.github/workflows/reusable-unit-tests.yml @@ -63,7 +63,7 @@ jobs: # different cache key since we cannot reuse it across commits. - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'corretto' java-version: ${{ inputs.jdk }} # the build step produces SNAPSHOT artifacts into the local maven repository, diff --git a/.github/workflows/standard-its.yml b/.github/workflows/standard-its.yml index 0083e952ea3d..f763f0d6966c 100644 --- a/.github/workflows/standard-its.yml +++ b/.github/workflows/standard-its.yml @@ -155,7 +155,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '8' - distribution: 'zulu' + distribution: 'corretto' # the build step produces SNAPSHOT artifacts into the local maven repository, # we include github.sha in the cache key to make it specific to that build/jdk diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml index a374cf72ccfe..93ace9097ecb 100644 --- a/.github/workflows/static-checks.yml +++ b/.github/workflows/static-checks.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'corretto' java-version: ${{ matrix.java }} cache: 'maven' @@ -122,7 +122,7 @@ jobs: - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'corretto' java-version: '8' cache: 'maven' @@ -152,7 +152,7 @@ jobs: - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'corretto' java-version: '8' cache: 'maven' @@ -184,7 +184,7 @@ jobs: - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'corretto' java-version: '17' cache: 'maven' diff --git a/.github/workflows/unit-and-integration-tests-unified.yml b/.github/workflows/unit-and-integration-tests-unified.yml index f2b9214d1aa8..b9e9cca93868 100644 --- a/.github/workflows/unit-and-integration-tests-unified.yml +++ b/.github/workflows/unit-and-integration-tests-unified.yml @@ -89,7 +89,7 @@ jobs: # different cache key since we cannot reuse it across commits. - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'corretto' java-version: ${{ matrix.jdk }} # the build step produces SNAPSHOT artifacts into the local maven repository,