Update Signature URL in BootJDK download, so Location field longer case sensitive. #3979
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gdams
approved these changes
Oct 7, 2024
sxa
approved these changes
Oct 7, 2024
| @@ -49,7 +49,7 @@ function downloadLinuxBootJDK() { | |||
| # the fallback mechanism, as downloading of the GA binary might fail. | |||
| set +e | |||
| curl -L -o bootjdk.tar.gz "${apiURL}" | |||
| apiSigURL=$(curl -v "${apiURL}" 2>&1 | tr -d \\r | awk '/^< Location:/{print $3 ".sig"}') | |||
| apiSigURL=$(curl -v "${apiURL}" 2>&1 | tr -d \\r | awk '/^< [Ll]ocation:/{print $3 ".sig"}') | |||
There was a problem hiding this comment.
A case insensitive search would work too, but I'm ok with this.
Suggested change
| apiSigURL=$(curl -v "${apiURL}" 2>&1 | tr -d \\r | awk '/^< [Ll]ocation:/{print $3 ".sig"}') | |
| apiSigURL=$(curl -v "${apiURL}" 2>&1 | tr -d \\r | awk '/^< Location:/i{print $3 ".sig"}') |
There was a problem hiding this comment.
/i doesnt work on my fedora installation.. so I went with the regex fix.
There was a problem hiding this comment.
Little bit of script I wrote to test..
apiURL=https://api.adoptium.net/v3/binary/latest/22/ga/linux/riscv64/jdk/hotspot/normal/eclipse
##apiSigURL=$(curl -v "${apiURL}" 2>&1 | tr -d \\r | awk '/^< [Ll]ocation:/{print $3 ".sig"}')
apiSigURL=$(curl -v "${apiURL}" 2>&1 | tr -d \\r | awk '/^< Location:/i{print $3 ".sig"}')
echo 1 = $apiURL
echo 2 = $apiSigURL
curl -L -o bootjdk.tar.gz.sig "${apiSigURL}"
mahdipub
pushed a commit
to mahdipub/temurin-build
that referenced
this pull request
Oct 24, 2024
mahdipub
pushed a commit
to mahdipub/temurin-build
that referenced
this pull request
Oct 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3978
Amends the curl command used to validate the signature URL to check either Location or location.
Test build running here: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk23u/job/jdk23u-linux-riscv64-temurin/16/console