From c1d52cab09fbadb2c8019522f0b37029f94a38b1 Mon Sep 17 00:00:00 2001 From: Grzegorz Banasiak Date: Sat, 8 Nov 2025 13:12:20 +0100 Subject: [PATCH] Fix current JDK major version extraction --- .buildkite/scripts/trigger-if-java-ea-new-build.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.buildkite/scripts/trigger-if-java-ea-new-build.sh b/.buildkite/scripts/trigger-if-java-ea-new-build.sh index 34d42c890c942..99727e9154184 100755 --- a/.buildkite/scripts/trigger-if-java-ea-new-build.sh +++ b/.buildkite/scripts/trigger-if-java-ea-new-build.sh @@ -13,7 +13,7 @@ RECENT_TIME_WINDOW=${RECENT_TIME_WINDOW:-24} # Extract current JDK major version from bundled_jdk in version.properties -CURRENT_JDK=$(grep "^bundled_jdk =" build-tools-internal/version.properties | cut -d'=' -f2 | tr -d ' ' | cut -d'+' -f1) +CURRENT_JDK=$(grep "^bundled_jdk =" build-tools-internal/version.properties | cut -d'=' -f2 | tr -d ' ' | cut -d'+' -f1 | cut -d'.' -f1) TARGET_JDK=$((CURRENT_JDK + 1)) echo "Current JDK major version: $CURRENT_JDK" @@ -51,10 +51,6 @@ echo "Latest JDK ${TARGET_JDK} build from ES archive:" echo " Timestamp: $TIMESTAMP" echo " JDK Identifier: $JDK_IDENTIFIER" -# Set variables for use in the pipeline trigger -jdkbuild="$JDK_IDENTIFIER" -jdk_timestamp="$TIMESTAMP" - # Check if timestamp is within last 24 hours CURRENT_TIME=$(date +%s) BUILD_TIME=$(date -d "$TIMESTAMP" +%s 2>/dev/null || date -j -f "%Y-%m-%dT%H:%M:%S" "${TIMESTAMP%Z}" +%s 2>/dev/null || echo "0")