Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ variables:
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
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-")
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
DEFAULT_TEST_JVMS: /^(8|11|17|21|stable)$/
DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/ # the latest "stable" version is LTS v25
PROFILE_TESTS:
description: "Enable profiling of tests"
value: "false"
Expand Down Expand Up @@ -61,14 +61,14 @@ workflow:
- "17"
- "21"
- "25"
- "stable"
- "semeru11"
- "oracle8"
- "zulu8"
- "semeru8"
- "ibm8"
- "zulu11"
- "semeru17"
# - "stable"
CI_SPLIT: ["1/1"]

# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
Expand Down Expand Up @@ -636,7 +636,7 @@ test_inst_latest:
CACHE_TYPE: "latestDep"
parallel:
matrix:
- testJvm: ["8", "17", "21", "stable"]
- testJvm: ["8", "17", "21", "25"] # the latest "stable" version is LTS v25
# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
# This emulates "parallel" by including it in the matrix
CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
Expand Down Expand Up @@ -688,7 +688,7 @@ test_debugger:
variables:
GRADLE_TARGET: ":debuggerTest"
CACHE_TYPE: "base"
DEFAULT_TEST_JVMS: /^(8|11|17|21|stable|semeru8)$/
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|semeru8)$/ # the latest "stable" version is LTS v25
parallel:
matrix: *test_matrix

Expand Down
2 changes: 1 addition & 1 deletion gradle/java_no_deps.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ def currentJavaHomePath = getJavaHomePath(System.getProperty("java.home"))
project.afterEvaluate {
def testJvm = gradle.startParameter.projectProperties["testJvm"]
def javaTestLauncher = null as Provider<JavaLauncher>
// "stable" is calculated as the largest X found in JAVA_X_HOME
if (testJvm == "stable") {
def javaVersions = System.getenv()
.findAll { it.key =~ /^JAVA_[0-9]+_HOME$/ }
.collect { (it.key =~ /^JAVA_(\d+)_HOME$/)[0][1] as Integer }
.findAll { it != 25 } // Exclude LTS JDK v25 (early access)

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