From faf5405ad57233303ec374826c47bd2f6846943e Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 2 Sep 2025 15:21:14 -0400 Subject: [PATCH 1/3] Add Java 25 to default testing --- .gitlab-ci.yml | 10 +++++----- gradle/java_no_deps.gradle | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 249791db132..8a006e1655e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,9 +28,9 @@ variables: GRADLE_VERSION: "8.14.3" # must match gradle-wrapper.properties MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/" 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-") + BUILDER_IMAGE_VERSION_PREFIX: "v25.09-" # 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)$/ # stable is currently not tested, as the latest stable version is LTS v25 PROFILE_TESTS: description: "Enable profiling of tests" value: "false" @@ -61,7 +61,6 @@ workflow: - "17" - "21" - "25" - - "stable" - "semeru11" - "oracle8" - "zulu8" @@ -69,6 +68,7 @@ workflow: - "ibm8" - "zulu11" - "semeru17" + # - "stable" CI_SPLIT: ["1/1"] # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time @@ -636,7 +636,7 @@ test_inst_latest: CACHE_TYPE: "latestDep" parallel: matrix: - - testJvm: ["8", "17", "21", "stable"] + - testJvm: ["8", "17", "21", "25"] # stable is currently not tested, as 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"] @@ -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)$/ # stable is currently not tested, as the latest stable version is LTS v25 parallel: matrix: *test_matrix diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index 89e7ba0705b..80694df9d09 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -154,11 +154,11 @@ def currentJavaHomePath = getJavaHomePath(System.getProperty("java.home")) project.afterEvaluate { def testJvm = gradle.startParameter.projectProperties["testJvm"] def javaTestLauncher = null as Provider + // "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.") From d318e49d491ff59db61c290295074b38b52aed28 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 5 Sep 2025 09:45:51 -0400 Subject: [PATCH 2/3] Revert builder image version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a006e1655e..64d4d0f9c6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: GRADLE_VERSION: "8.14.3" # must match gradle-wrapper.properties MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/" GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/" - BUILDER_IMAGE_VERSION_PREFIX: "v25.09-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-") + 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|25)$/ # stable is currently not tested, as the latest stable version is LTS v25 PROFILE_TESTS: From 7d719e04e7433b28e129aeb3f1f22cef971cd91c Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 5 Sep 2025 09:48:43 -0400 Subject: [PATCH 3/3] Edit comment --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64d4d0f9c6e..93638d22d87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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|25)$/ # stable is currently not tested, as the latest stable version is LTS v25 + DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/ # the latest "stable" version is LTS v25 PROFILE_TESTS: description: "Enable profiling of tests" value: "false" @@ -636,7 +636,7 @@ test_inst_latest: CACHE_TYPE: "latestDep" parallel: matrix: - - testJvm: ["8", "17", "21", "25"] # stable is currently not tested, as the latest stable version is LTS v25 + - 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"] @@ -688,7 +688,7 @@ test_debugger: variables: GRADLE_TARGET: ":debuggerTest" CACHE_TYPE: "base" - DEFAULT_TEST_JVMS: /^(8|11|17|21|25|semeru8)$/ # stable is currently not tested, as the latest stable version is LTS v25 + DEFAULT_TEST_JVMS: /^(8|11|17|21|25|semeru8)$/ # the latest "stable" version is LTS v25 parallel: matrix: *test_matrix