Skip to content

Commit 853b95c

Browse files
authored
Change Java 25 to default JVM testing (#9453)
* Add Java 25 to default testing * Revert builder image version * Edit comment
1 parent e3406d4 commit 853b95c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variables:
3030
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
3131
BUILDER_IMAGE_VERSION_PREFIX: "v25.07-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
3232
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
33-
DEFAULT_TEST_JVMS: /^(8|11|17|21|stable)$/
33+
DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/ # the latest "stable" version is LTS v25
3434
PROFILE_TESTS:
3535
description: "Enable profiling of tests"
3636
value: "false"
@@ -61,14 +61,14 @@ workflow:
6161
- "17"
6262
- "21"
6363
- "25"
64-
- "stable"
6564
- "semeru11"
6665
- "oracle8"
6766
- "zulu8"
6867
- "semeru8"
6968
- "ibm8"
7069
- "zulu11"
7170
- "semeru17"
71+
# - "stable"
7272
CI_SPLIT: ["1/1"]
7373

7474
# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
@@ -636,7 +636,7 @@ test_inst_latest:
636636
CACHE_TYPE: "latestDep"
637637
parallel:
638638
matrix:
639-
- testJvm: ["8", "17", "21", "stable"]
639+
- testJvm: ["8", "17", "21", "25"] # the latest "stable" version is LTS v25
640640
# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
641641
# This emulates "parallel" by including it in the matrix
642642
CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
@@ -688,7 +688,7 @@ test_debugger:
688688
variables:
689689
GRADLE_TARGET: ":debuggerTest"
690690
CACHE_TYPE: "base"
691-
DEFAULT_TEST_JVMS: /^(8|11|17|21|stable|semeru8)$/
691+
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|semeru8)$/ # the latest "stable" version is LTS v25
692692
parallel:
693693
matrix: *test_matrix
694694

gradle/java_no_deps.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ def currentJavaHomePath = getJavaHomePath(System.getProperty("java.home"))
154154
project.afterEvaluate {
155155
def testJvm = gradle.startParameter.projectProperties["testJvm"]
156156
def javaTestLauncher = null as Provider<JavaLauncher>
157+
// "stable" is calculated as the largest X found in JAVA_X_HOME
157158
if (testJvm == "stable") {
158159
def javaVersions = System.getenv()
159160
.findAll { it.key =~ /^JAVA_[0-9]+_HOME$/ }
160161
.collect { (it.key =~ /^JAVA_(\d+)_HOME$/)[0][1] as Integer }
161-
.findAll { it != 25 } // Exclude LTS JDK v25 (early access)
162162

163163
if (javaVersions.isEmpty()) {
164164
throw new GradleException("No valid JAVA_X_HOME environment variables found.")

0 commit comments

Comments
 (0)