Skip to content

Fix current JDK major version extraction #137779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2025
Merged

Fix current JDK major version extraction #137779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions .buildkite/scripts/trigger-if-java-ea-new-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")
Expand Down