Skip to content

Commit ecb8a19

Browse files
gbanasiakKubik42
authored andcommitted
Fix current JDK major version extraction (elastic#137779)
1 parent e36cb0c commit ecb8a19

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

.buildkite/scripts/trigger-if-java-ea-new-build.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
RECENT_TIME_WINDOW=${RECENT_TIME_WINDOW:-24}
1414

1515
# Extract current JDK major version from bundled_jdk in version.properties
16-
CURRENT_JDK=$(grep "^bundled_jdk =" build-tools-internal/version.properties | cut -d'=' -f2 | tr -d ' ' | cut -d'+' -f1)
16+
CURRENT_JDK=$(grep "^bundled_jdk =" build-tools-internal/version.properties | cut -d'=' -f2 | tr -d ' ' | cut -d'+' -f1 | cut -d'.' -f1)
1717
TARGET_JDK=$((CURRENT_JDK + 1))
1818

1919
echo "Current JDK major version: $CURRENT_JDK"
@@ -51,10 +51,6 @@ echo "Latest JDK ${TARGET_JDK} build from ES archive:"
5151
echo " Timestamp: $TIMESTAMP"
5252
echo " JDK Identifier: $JDK_IDENTIFIER"
5353

54-
# Set variables for use in the pipeline trigger
55-
jdkbuild="$JDK_IDENTIFIER"
56-
jdk_timestamp="$TIMESTAMP"
57-
5854
# Check if timestamp is within last 24 hours
5955
CURRENT_TIME=$(date +%s)
6056
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")

0 commit comments

Comments
 (0)