From 404d6533c4d9a54d079ecbefba34d7fd9a45a044 Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Fri, 23 Jan 2026 14:48:53 -0500 Subject: [PATCH 1/6] ci: add env vars for jdk ea builds --- .github/workflows/ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80f6bc5acbaf..6ded5b646abc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,6 +117,11 @@ jobs: needs: sanity permissions: contents: read + env: + JAVA_VERSION: ${{ matrix.java.version }} + USE_BAZEL_VERSION: "9.0.0" + JDK_EA_MAJOR: "26" + JDK_EA_BUILD: "16" strategy: fail-fast: true matrix: @@ -133,7 +138,7 @@ jobs: {version: '17', experimental: false}, {version: '24', experimental: false}, {version: '25', experimental: false}, - {version: '26.0.0-ea.16.0.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' @@ -175,10 +180,6 @@ jobs: java: {version: '17', experimental: false} - script: 'daikon-part2' java: {version: '17', experimental: false} - - env: - JAVA_VERSION: ${{ matrix.java.version }} - USE_BAZEL_VERSION: "9.0.0" continue-on-error: ${{ matrix.java.experimental }} steps: - name: Check out sources @@ -202,7 +203,7 @@ jobs: 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 }} + java-version: ${{ matrix.java.version == 'ea' && format('{0}-ea+{1}', env.JDK_EA_MAJOR, env.JDK_EA_BUILD) || matrix.java.version }} distribution: 'temurin' - 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 From d9a6ec51df00f9f51fc02ad762a51f7e78da64ab Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Mon, 26 Jan 2026 14:03:30 -0500 Subject: [PATCH 2/6] fix: try sem var with major and minor version --- .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 6ded5b646abc..38e5e5256b8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -203,7 +203,7 @@ jobs: 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}-ea+{1}', env.JDK_EA_MAJOR, env.JDK_EA_BUILD) || matrix.java.version }} + java-version: ${{ matrix.java.version == 'ea' && format('{0}.0.0-ea+{1}', env.JDK_EA_MAJOR, env.JDK_EA_BUILD) || matrix.java.version }} distribution: 'temurin' - 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 From 93792194b239d61459381cbe30fbe1959a9aad91 Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Tue, 27 Jan 2026 13:26:43 -0500 Subject: [PATCH 3/6] fix: match temurin ea semvar --- .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 38e5e5256b8c..6dde292c06f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -203,7 +203,7 @@ jobs: 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}', env.JDK_EA_MAJOR, env.JDK_EA_BUILD) || matrix.java.version }} + 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' - 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 From 4a118c9b0edf24979c1054ca9c580c8d5c621377 Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Tue, 27 Jan 2026 14:17:28 -0500 Subject: [PATCH 4/6] ci: update ORG_GRADLE_PROJECT to handle dynamic 'ea' var --- .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 6dde292c06f0..d0743cdba782 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -243,7 +243,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 }} + ORG_GRADLE_PROJECT_useJdkVersion: ${{ matrix.java.version == 'ea' && env.JDK_EA_MAJOR || matrix.java.version }} # Sanity tests on Windows and MacOS. otheros: From dbb03b44858c047fb91512b4465656cd832143b2 Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Tue, 27 Jan 2026 15:57:35 -0500 Subject: [PATCH 5/6] ci: add regexManager entry for JDK_EA_BUILD env var --- .github/renovate.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index 1a96950f0995..6fe2a0f5527b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -26,6 +26,16 @@ "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: \"(?\\d+)\"[\\s\\S]*?JDK_EA_BUILD: \"(?\\d+)\"" + ], + "datasourceTemplate": "github-tags", + "depNameTemplate": "adoptium/temurin{{{major}}}-binaries", + "extractVersionTemplate": "^jdk-\\d+\\+(?\\d+).*$" } ] } From 026f39ff6a721bd9453775b4fec00817ccaa407a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Jan 2026 07:47:31 +0000 Subject: [PATCH 6/6] chore(deps): update gradle/actions action to v5.0.1 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0743cdba782..9adfdd901304 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: # 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 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5.0.0 + uses: gradle/actions/setup-gradle@v5.0.1 - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.18.0 @@ -94,7 +94,7 @@ jobs: # 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 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5.0.0 + uses: gradle/actions/setup-gradle@v5.0.1 # Setup for misc tests - name: Install misc dependencies if: ${{ matrix.script == 'misc' }} @@ -211,7 +211,7 @@ jobs: # 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 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5.0.0 + uses: gradle/actions/setup-gradle@v5.0.1 - name: Install misc dependencies if: ${{ matrix.script == 'misc' }} run: | @@ -270,7 +270,7 @@ jobs: # 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 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5.0.0 + uses: gradle/actions/setup-gradle@v5.0.1 - name: Install coreutils on MacOS if: ${{ matrix.os == 'macos-latest' }}