Skip to content

Commit 98ea1ea

Browse files
Merge pull request #28 from thisisalexandercook/alex/renovate-jdk-ea-build-14-test
CI: test Renovate upgrade from JDK 27 EA build 14
2 parents a422a0a + 82b1639 commit 98ea1ea

2 files changed

Lines changed: 29 additions & 14 deletions

File tree

.github/renovate.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
"matchStrings": [
3838
"JDK_EA_MAJOR:\\s+\"(?<major>\\d+)\"[\\s\\S]*?JDK_EA_BUILD:\\s+\"(?<currentValue>\\d+)\""
3939
],
40-
"datasourceTemplate": "github-releases",
40+
"datasourceTemplate": "github-tags",
41+
"depNameTemplate": "openjdk/jdk",
4142
"versioningTemplate": "loose",
42-
"depNameTemplate": "adoptium/temurin{{{major}}}-binaries",
43-
"extractVersionTemplate": "^jdk-\\d+\\+(?<version>\\d+)"
43+
"extractVersionTemplate": "^jdk-{{{major}}}\\+(?<version>\\d+)$"
4444
}
4545
]
4646
}

.github/workflows/ci.yml

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ jobs:
3333
uses: actions/setup-java@v5
3434
with:
3535
java-version: ${{ matrix.java_version }}
36-
distribution: 'temurin'
36+
distribution: 'zulu'
37+
cache: 'gradle'
3738

3839
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
3940
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
@@ -90,7 +91,8 @@ jobs:
9091
uses: actions/setup-java@v5
9192
with:
9293
java-version: ${{ matrix.java_version }}
93-
distribution: 'temurin'
94+
distribution: 'zulu'
95+
cache: 'gradle'
9496

9597
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
9698
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
@@ -121,8 +123,8 @@ jobs:
121123
env:
122124
JAVA_VERSION: ${{ matrix.java.version }}
123125
USE_BAZEL_VERSION: "9.0.1"
124-
JDK_EA_MAJOR: "26"
125-
JDK_EA_BUILD: "35"
126+
JDK_EA_MAJOR: "27"
127+
JDK_EA_BUILD: "14"
126128
strategy:
127129
fail-fast: true
128130
matrix:
@@ -139,7 +141,8 @@ jobs:
139141
{version: '11', experimental: false},
140142
{version: '17', experimental: false},
141143
{version: '25', experimental: false},
142-
{version: 'ea', experimental: true}]
144+
{version: '26', experimental: false},
145+
{version: 'EA', experimental: true}]
143146
exclude:
144147
# JDK 8 does not allow toolchains, so testing 'cftests-junit-jdk21' is unnecessary.
145148
- script: 'cftests-junit-jdk21'
@@ -199,15 +202,26 @@ jobs:
199202
with:
200203
# Install JDK 21 first, to make it available to Gradle using `gradle.properties` below.
201204
java-version: 21
202-
distribution: 'temurin'
205+
distribution: 'zulu'
206+
cache: 'gradle'
203207
- name: Set up JDK ${{ matrix.java.version }}
208+
if: ${{ matrix.java.version != 'EA' }}
204209
uses: actions/setup-java@v5
205210
with:
206211
# Install the requested JDK second, to make it the default on which everything else runs.
207-
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 }}
208-
distribution: 'temurin'
212+
java-version: ${{ matrix.java.version }}
213+
distribution: 'zulu'
214+
cache: 'gradle'
215+
- name: Set up JDK ${{ env.JDK_EA_MAJOR }}
216+
if: ${{ matrix.java.version == 'EA' }}
217+
uses: oracle-actions/setup-java@v1
218+
with:
219+
# Install the requested EA JDK second, to make it the default on which everything else runs.
220+
website: jdk.java.net
221+
release: ${{ env.JDK_EA_MAJOR }}
222+
version: ${{ format('{0}-ea+{1}', env.JDK_EA_MAJOR, env.JDK_EA_BUILD) }}
209223
- name: Inject JAVA_HOME_21_64 into `gradle.properties` to always use JDK 21 for Gradle
210-
run: mkdir ~/.gradle && echo "org.gradle.java.home=$JAVA_HOME_21_X64" >> ~/.gradle/gradle.properties
224+
run: mkdir -p ~/.gradle && echo "org.gradle.java.home=$JAVA_HOME_21_X64" >> ~/.gradle/gradle.properties
211225

212226
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
213227
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
@@ -244,7 +258,7 @@ jobs:
244258
# Set the JDK version to use, allowing us to e.g. run Java 25 while gradle does not work
245259
# on Java 25 yet.
246260
env:
247-
ORG_GRADLE_PROJECT_useJdkVersion: ${{ matrix.java.version == 'ea' && env.JDK_EA_MAJOR || matrix.java.version }}
261+
ORG_GRADLE_PROJECT_useJdkVersion: ${{ matrix.java.version == 'EA' && env.JDK_EA_MAJOR || matrix.java.version }}
248262

249263
# Sanity tests on Windows and MacOS.
250264
otheros:
@@ -266,7 +280,8 @@ jobs:
266280
uses: actions/setup-java@v5
267281
with:
268282
java-version: ${{ matrix.java_version }}
269-
distribution: 'temurin'
283+
distribution: 'zulu'
284+
cache: 'gradle'
270285

271286
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
272287
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md

0 commit comments

Comments
 (0)