Skip to content

Commit

Permalink
Merge pull request #823 from lemeurherve/hotfix-updatecli-remove-debi…
Browse files Browse the repository at this point in the history
…an-jdk21-preview

hotfix(updatecli): remove remnant of jdk21-preview
  • Loading branch information
dduportal committed Jun 17, 2024
2 parents 4d64c28 + 21f582f commit 17a76f4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
11 changes: 0 additions & 11 deletions updatecli/scripts/check-jdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@ function get_jdk_download_url() {
## JDK19 URLs have an underscore ('_') instead of a plus ('+') in their archive names
echo "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-${jdk_version}/OpenJDK19U-jdk_${platform}_hotspot_${jdk_version//+/_}";
return 0;;
21*-ea-beta)
# JDK preview version (21+35-ea-beta, 21.0.1+12-ea-beta)
# This has been updated to support the new inferred URL pattern that started as of 21.0.3+2-ea-beta. It will not work for earlier preview versions.
# One could update the cases to support all preview versions, if desired.
jdk_version="${jdk_version//-beta}"
## https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35-ea-beta/OpenJDK21U-jdk_aarch64_linux_hotspot_ea_21-0-35.tar.gz
## https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12-ea-beta/OpenJDK21U-jdk_x64_linux_hotspot_ea_21-0-1-12.tar.gz
dashJDKVersion="${jdk_version//+/_}"
jdk_version="${jdk_version//-ea}"
echo "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-${jdk_version//+/%2B}-ea-beta/OpenJDK21U-jdk_${platform}_hotspot_${dashJDKVersion}"
return 0;;
21*)
## JDK21 URLs have an underscore ('_') instead of a plus ('+') in their archive names
echo "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-${jdk_version}/OpenJDK21U-jdk_${platform}_hotspot_${jdk_version//+/_}";
Expand Down
10 changes: 0 additions & 10 deletions updatecli/updatecli.d/debian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,6 @@ targets:
keyword: "ARG"
matcher: "DEBIAN_RELEASE"
scmid: default
updatePreviewDockerfile:
name: "Update the value of the base image (ARG DEBIAN_RELEASE) in the preview Dockerfile"
kind: dockerfile
sourceid: bookwormLatestVersion
spec:
file: debian/preview/Dockerfile
instruction:
keyword: "ARG"
matcher: "DEBIAN_RELEASE"
scmid: default
updateDockerBake:
name: "Update the default value of the variable DEBIAN_RELEASE in the docker-bake.hcl"
kind: hcl
Expand Down

0 comments on commit 17a76f4

Please sign in to comment.