From d28f70039c3e8c69faf2a9e34bc22f2bfb4de626 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Thu, 26 Mar 2026 16:57:31 -0400 Subject: [PATCH 1/7] CI: Test on JDK 26 stable and JDK 27 EA --- .github/workflows/ci.yml | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7a5c9756da..c213f150097 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,8 @@ jobs: uses: actions/setup-java@v5 with: java-version: ${{ matrix.java_version }} - distribution: 'temurin' + distribution: 'zulu' + cache: 'gradle' # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md @@ -90,7 +91,8 @@ jobs: uses: actions/setup-java@v5 with: java-version: ${{ matrix.java_version }} - distribution: 'temurin' + distribution: 'zulu' + cache: 'gradle' # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md @@ -121,8 +123,7 @@ jobs: env: JAVA_VERSION: ${{ matrix.java.version }} USE_BAZEL_VERSION: "9.0.1" - JDK_EA_MAJOR: "26" - JDK_EA_BUILD: "35" + JDK_EA_MAJOR: "27" strategy: fail-fast: true matrix: @@ -199,13 +200,24 @@ jobs: with: # Install JDK 21 first, to make it available to Gradle using `gradle.properties` below. java-version: 21 - distribution: 'temurin' + distribution: 'zulu' + cache: 'gradle' - name: Set up JDK ${{ matrix.java.version }} + if: ${{ matrix.java.version != 'EA' }} uses: actions/setup-java@v5 with: # Install the requested JDK second, to make it the default on which everything else runs. - java-version: ${{ matrix.java.version == 'ea' && format('{0}.0.0-ea.{1}.0.ea', env.JDK_EA_MAJOR, env.JDK_EA_BUILD) || matrix.java.version }} - distribution: 'temurin' + java-version: ${{ matrix.java.version }} + distribution: 'zulu' + cache: 'gradle' + - name: Set up JDK $JDK_EA_MAJOR + if: ${{ matrix.java.version == 'EA' }} + uses: oracle-actions/setup-java@v1 + with: + # Install the requested EA JDK second, to make it the default on which everything else runs. + website: jdk.java.net + release: ${{ matrix.java.version }} + cache: 'gradle' - name: Inject JAVA_HOME_21_64 into `gradle.properties` to always use JDK 21 for Gradle run: mkdir ~/.gradle && echo "org.gradle.java.home=$JAVA_HOME_21_X64" >> ~/.gradle/gradle.properties @@ -244,7 +256,7 @@ jobs: # Set the JDK version to use, allowing us to e.g. run Java 25 while gradle does not work # on Java 25 yet. env: - ORG_GRADLE_PROJECT_useJdkVersion: ${{ matrix.java.version == 'ea' && env.JDK_EA_MAJOR || matrix.java.version }} + ORG_GRADLE_PROJECT_useJdkVersion: ${{ matrix.java.version == 'EA' && env.JDK_EA_MAJOR || matrix.java.version }} # Sanity tests on Windows and MacOS. otheros: @@ -266,7 +278,8 @@ jobs: uses: actions/setup-java@v5 with: java-version: ${{ matrix.java_version }} - distribution: 'temurin' + distribution: 'zulu' + cache: 'gradle' # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md From f6e0f5740ff93bfd4cf44e701aba65cdee1b0482 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Thu, 26 Mar 2026 17:05:46 -0400 Subject: [PATCH 2/7] Fix JDK EA version reference in CI workflow --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c213f150097..d62d4c66c4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,7 +140,7 @@ jobs: {version: '11', experimental: false}, {version: '17', experimental: false}, {version: '25', experimental: false}, - {version: 'ea', experimental: true}] + {version: 'EA', experimental: true}] exclude: # JDK 8 does not allow toolchains, so testing 'cftests-junit-jdk21' is unnecessary. - script: 'cftests-junit-jdk21' @@ -210,7 +210,7 @@ jobs: java-version: ${{ matrix.java.version }} distribution: 'zulu' cache: 'gradle' - - name: Set up JDK $JDK_EA_MAJOR + - name: Set up JDK ${{ env.JDK_EA_MAJOR }} if: ${{ matrix.java.version == 'EA' }} uses: oracle-actions/setup-java@v1 with: From e88a9e91bc0ab9e45645bd5c8e23b425d71b395b Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Thu, 26 Mar 2026 17:06:18 -0400 Subject: [PATCH 3/7] Add Java version 26 to CI workflow --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d62d4c66c4a..32381cfd2c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,6 +140,7 @@ jobs: {version: '11', experimental: false}, {version: '17', experimental: false}, {version: '25', experimental: false}, + {version: '26', experimental: false}, {version: 'EA', experimental: true}] exclude: # JDK 8 does not allow toolchains, so testing 'cftests-junit-jdk21' is unnecessary. From 7252c8da95d51d5bee2aabcecb135d4893f6834d Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Fri, 27 Mar 2026 19:52:34 -0400 Subject: [PATCH 4/7] Fix directory creation command in CI workflow --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32381cfd2c2..74d7f8d722a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,9 +218,8 @@ jobs: # Install the requested EA JDK second, to make it the default on which everything else runs. website: jdk.java.net release: ${{ matrix.java.version }} - cache: 'gradle' - name: Inject JAVA_HOME_21_64 into `gradle.properties` to always use JDK 21 for Gradle - run: mkdir ~/.gradle && echo "org.gradle.java.home=$JAVA_HOME_21_X64" >> ~/.gradle/gradle.properties + run: mkdir -p ~/.gradle && echo "org.gradle.java.home=$JAVA_HOME_21_X64" >> ~/.gradle/gradle.properties # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md From 818ef5656a5d1ee986984addaaea2a3ea1a4a8d5 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Sun, 29 Mar 2026 20:40:26 -0400 Subject: [PATCH 5/7] Remove JDK_EA_BUILD update configuration --- .github/renovate.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index f51fd58c323..5817303e767 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -30,17 +30,6 @@ "matchStrings": ["USE_BAZEL_VERSION: \"(?.*?)\""], "datasourceTemplate": "github-releases", "depNameTemplate": "bazelbuild/bazel" - }, - { - "description": "Update JDK_EA_BUILD in GitHub Actions", - "fileMatch": ["^\\.github/workflows/ci\\.yml$"], - "matchStrings": [ - "JDK_EA_MAJOR:\\s+\"(?\\d+)\"[\\s\\S]*?JDK_EA_BUILD:\\s+\"(?\\d+)\"" - ], - "datasourceTemplate": "github-releases", - "versioningTemplate": "loose", - "depNameTemplate": "adoptium/temurin{{{major}}}-binaries", - "extractVersionTemplate": "^jdk-\\d+\\+(?\\d+)" } ] } From b237b6d375b5726f499c806d5b58c6b0508490d9 Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Wed, 1 Apr 2026 10:14:58 -0400 Subject: [PATCH 6/7] CI: pin JDK 27 EA build and restore renovate updates --- .github/renovate.json | 11 +++++++++++ .github/workflows/ci.yml | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 5817303e767..1353c9fcbfb 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -30,6 +30,17 @@ "matchStrings": ["USE_BAZEL_VERSION: \"(?.*?)\""], "datasourceTemplate": "github-releases", "depNameTemplate": "bazelbuild/bazel" + }, + { + "description": "Update JDK_EA_BUILD in GitHub Actions", + "fileMatch": ["^\\.github/workflows/ci\\.yml$"], + "matchStrings": [ + "JDK_EA_MAJOR:\\s+\"(?\\d+)\"[\\s\\S]*?JDK_EA_BUILD:\\s+\"(?\\d+)\"" + ], + "datasourceTemplate": "github-tags", + "depNameTemplate": "openjdk/jdk", + "versioningTemplate": "loose", + "extractVersionTemplate": "^jdk-{{{major}}}\\+(?\\d+)$" } ] } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74d7f8d722a..c26e63f62a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,6 +124,7 @@ jobs: JAVA_VERSION: ${{ matrix.java.version }} USE_BAZEL_VERSION: "9.0.1" JDK_EA_MAJOR: "27" + JDK_EA_BUILD: "15" strategy: fail-fast: true matrix: @@ -217,7 +218,8 @@ jobs: with: # Install the requested EA JDK second, to make it the default on which everything else runs. website: jdk.java.net - release: ${{ matrix.java.version }} + release: ${{ env.JDK_EA_MAJOR }} + version: ${{ format('{0}-ea+{1}', env.JDK_EA_MAJOR, env.JDK_EA_BUILD) }} - name: Inject JAVA_HOME_21_64 into `gradle.properties` to always use JDK 21 for Gradle run: mkdir -p ~/.gradle && echo "org.gradle.java.home=$JAVA_HOME_21_X64" >> ~/.gradle/gradle.properties From 82b16391849a3a9d990c7f27b2602875787049c0 Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Wed, 1 Apr 2026 11:12:00 -0400 Subject: [PATCH 7/7] CI: test renovate upgrade from JDK 27 EA build 14 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c26e63f62a2..a1448d05c99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,7 @@ jobs: JAVA_VERSION: ${{ matrix.java.version }} USE_BAZEL_VERSION: "9.0.1" JDK_EA_MAJOR: "27" - JDK_EA_BUILD: "15" + JDK_EA_BUILD: "14" strategy: fail-fast: true matrix: