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+).*$" } ] } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80f6bc5acbaf..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' }} @@ -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}.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 @@ -210,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: | @@ -242,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: @@ -269,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' }}