Skip to content

Commit 37bd3da

Browse files
committed
Run stable Java 26 as default JVM
1 parent 7f66c79 commit 37bd3da

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

.gitlab-ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
3232
BUILDER_IMAGE_VERSION_PREFIX: "v26.01-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
3333
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
34-
DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/ # the latest "stable" version is LTS v25
34+
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|stable)$/
3535
PROFILE_TESTS:
3636
description: "Enable profiling of tests"
3737
value: "false"
@@ -62,15 +62,14 @@ workflow:
6262
- "17"
6363
- "21"
6464
- "25"
65-
- "26"
6665
- "semeru11"
6766
- "oracle8"
6867
- "zulu8"
6968
- "semeru8"
7069
- "ibm8"
7170
- "zulu11"
7271
- "semeru17"
73-
# - "stable"
72+
- "stable"
7473
CI_SPLIT: ["1/1"]
7574

7675
# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
@@ -598,6 +597,11 @@ muzzle-dep-report:
598597
- *prepare_test_env
599598
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djava.util.prefs.userRoot=/tmp/.java/.userPrefs-${CI_JOB_ID}' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
600599
- ./gradlew --version
600+
- |
601+
if [ "$testJvm" == "stable" ]; then
602+
STABLE_JAVA=$(env | sed -n 's/^JAVA_\([0-9][0-9]*\)_HOME=.*/\1/p' | sort -n | tail -1)
603+
echo "STABLE_JAVA is Java ${STABLE_JAVA}"
604+
fi
601605
- ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -Pslot=$CI_NODE_INDEX/$CI_NODE_TOTAL $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE
602606
after_script:
603607
- *restore_pretest_env

0 commit comments

Comments
 (0)