Skip to content

Commit fa7760a

Browse files
ravisingalclaude
andcommitted
fix: derive JAVA_FULL_VERSION from the real OpenJDK version, not the Zulu build number
The java.version format changed to Azul's CDN filename style (e.g. zulu11.92.109-ca-jdk11.0.33), which broke the cut-based parsing: it produced tags like hypertrace/java:zulu11 and hypertrace/java:zulu11.92.109 instead of updating hypertrace/java:11, and JAVA_FULL_VERSION no longer matched the actual OpenJDK patch version consumers expect (e.g. 11.0.33). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
1 parent 3f62f1d commit fa7760a

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

‎.github/workflows/publish.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,14 @@ jobs:
3434
run: |
3535
ZULU_JDK_VERSION=$(cat java-${{ matrix.java-major-version}}/java.version | tr -d "\n")
3636
echo ZULU_JDK_VERSION=${ZULU_JDK_VERSION} >> $GITHUB_OUTPUT
37-
echo JAVA_MAJOR_VERSION=$(echo $ZULU_JDK_VERSION | cut -d'.' -f1) >> $GITHUB_OUTPUT
38-
echo JAVA_FULL_VERSION=$(echo $ZULU_JDK_VERSION | cut -d'-' -f1) >> $GITHUB_OUTPUT
37+
echo JAVA_MAJOR_VERSION=$(echo $ZULU_JDK_VERSION | cut -d'.' -f1 | sed s/zulu//) >> $GITHUB_OUTPUT
38+
if echo "$ZULU_JDK_VERSION" | grep -q 'ca-jdk'; then
39+
# New Azul CDN filename format, e.g. zulu11.92.109-ca-jdk11.0.33: take the real OpenJDK version after "ca-jdk".
40+
JAVA_FULL_VERSION=$(echo "$ZULU_JDK_VERSION" | sed 's/.*ca-jdk//')
41+
else
42+
JAVA_FULL_VERSION=$(echo "$ZULU_JDK_VERSION" | cut -d'-' -f1 | sed s/zulu//)
43+
fi
44+
echo JAVA_FULL_VERSION=${JAVA_FULL_VERSION} >> $GITHUB_OUTPUT
3945
BASE_IMAGE=$(cat java-${{ matrix.java-major-version}}/base.image | tr -d "\n")
4046
echo BASE_IMAGE=${BASE_IMAGE} >> $GITHUB_OUTPUT
4147
@@ -48,4 +54,4 @@ jobs:
4854
JAVA_VERSION=${{ steps.versions.outputs.ZULU_JDK_VERSION }}
4955
BASE_IMAGE=${{ steps.versions.outputs.BASE_IMAGE }}
5056
tags: hypertrace/java:${{ steps.versions.outputs.JAVA_MAJOR_VERSION }},hypertrace/java:${{ steps.versions.outputs.JAVA_FULL_VERSION }}
51-
push: true
57+
push: true

0 commit comments

Comments
 (0)