graalvm/setup-graalvm
1
0
Fork 0
mirror of https://github.com/graalvm/setup-graalvm.git synced 2024-10-12 14:09:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor edit.

Browse Source
This commit is contained in:
Fabio Niephaus 2024-02-13 17:16:15 +01:00
parent bf3e45bce6
commit 22551b2bec
No known key found for this signature in database
GPG Key ID: F21CF5275F31DFD6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/main/index.js generated vendored
View File

Binary file not shown.

8
src/graalvm.ts
View File

@ -29,7 +29,8 @@ export async function setUpGraalVMJDK(
return setUpGraalVMJDKDevBuild() return setUpGraalVMJDKDevBuild()
} }
const javaVersion = javaVersionOrDev const javaVersion = javaVersionOrDev
let toolName = determineToolName(javaVersion, false) const toolName = determineToolName(javaVersion, false)
let downloadName = toolName
let downloadUrl: string let downloadUrl: string
if (javaVersion.includes('.')) { if (javaVersion.includes('.')) {
if (semver.valid(javaVersion)) { if (semver.valid(javaVersion)) {
@ -37,7 +38,6 @@ export async function setUpGraalVMJDK(
const minorJavaVersion = semver.minor(javaVersion) const minorJavaVersion = semver.minor(javaVersion)
const patchJavaVersion = semver.patch(javaVersion) const patchJavaVersion = semver.patch(javaVersion)
const isGARelease = minorJavaVersion === 0 && patchJavaVersion === 0 const isGARelease = minorJavaVersion === 0 && patchJavaVersion === 0
let downloadName = toolName
if (isGARelease) { if (isGARelease) {
// For GA versions of JDKs, /archive/ does not use minor and patch version (see https://www.oracle.com/java/technologies/jdk-script-friendly-urls/) // For GA versions of JDKs, /archive/ does not use minor and patch version (see https://www.oracle.com/java/technologies/jdk-script-friendly-urls/)
downloadName = determineToolName(majorJavaVersion.toString(), false) downloadName = determineToolName(majorJavaVersion.toString(), false)
@ -51,7 +51,7 @@ export async function setUpGraalVMJDK(
} else if (javaVersion === '22-ea') { } else if (javaVersion === '22-ea') {
downloadUrl = await findLatestEABuildDownloadUrl(javaVersion) downloadUrl = await findLatestEABuildDownloadUrl(javaVersion)
} else { } else {
downloadUrl = `${GRAALVM_DL_BASE}/${javaVersion}/latest/${toolName}${c.GRAALVM_FILE_EXTENSION}` downloadUrl = `${GRAALVM_DL_BASE}/${javaVersion}/latest/${downloadName}${c.GRAALVM_FILE_EXTENSION}`
} }
const downloader = async () => downloadGraalVMJDK(downloadUrl, javaVersion) const downloader = async () => downloadGraalVMJDK(downloadUrl, javaVersion)
return downloadExtractAndCacheJDK(downloader, toolName, javaVersion) return downloadExtractAndCacheJDK(downloader, toolName, javaVersion)
@ -126,7 +126,7 @@ export async function findLatestGraalVMJDKCEJavaVersion(
} }
function determineToolName(javaVersion: string, isCommunity: boolean) { function determineToolName(javaVersion: string, isCommunity: boolean) {
return `graalvm${isCommunity ? '-community' : ''}-jdk-${toSemVer(javaVersion)}_${ return `graalvm${isCommunity ? '-community' : ''}-jdk-${javaVersion}_${
c.JDK_PLATFORM c.JDK_PLATFORM
}-${c.JDK_ARCH}_bin` }-${c.JDK_ARCH}_bin`
} }