Skip to content

Commit 10fbb69

Browse files
fix: runtime reporting for tip job
1 parent 6162c82 commit 10fbb69

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

.gitlab/upload_ciapp.sh

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,23 @@ TEST_JVM=${2:-}
99
JAVA_PROPS=""
1010
if [ -n "$TEST_JVM" ]; then
1111
JAVA_BIN=""
12-
if [[ "$TEST_JVM" =~ ^[A-Za-z0-9_]+$ ]]; then
13-
JAVA_HOME_VAR="JAVA_${TEST_JVM}_HOME"
12+
RESOLVED_JVM="$TEST_JVM"
13+
if [ "$TEST_JVM" = "tip" ]; then
14+
# Resolve "tip" to the highest available JAVA_*_HOME version
15+
MAX_VER=0
16+
for var in $(compgen -v JAVA_ | grep -E '^JAVA_[0-9]+_HOME$'); do
17+
ver="${var#JAVA_}"
18+
ver="${ver%_HOME}"
19+
if [ "$ver" -gt "$MAX_VER" ] 2>/dev/null; then
20+
MAX_VER="$ver"
21+
fi
22+
done
23+
if [ "$MAX_VER" -gt 0 ] 2>/dev/null; then
24+
RESOLVED_JVM="$MAX_VER"
25+
fi
26+
fi
27+
if [[ "$RESOLVED_JVM" =~ ^[A-Za-z0-9_]+$ ]]; then
28+
JAVA_HOME_VAR="JAVA_${RESOLVED_JVM}_HOME"
1429
JAVA_HOME_VALUE="${!JAVA_HOME_VAR}"
1530
if [ -n "$JAVA_HOME_VALUE" ] && [ -x "$JAVA_HOME_VALUE/bin/java" ]; then
1631
JAVA_BIN="$JAVA_HOME_VALUE/bin/java"

0 commit comments

Comments
 (0)