graalvm/setup-graalvm
1
0
Fork 0
mirror of https://github.com/graalvm/setup-graalvm.git synced 2025-02-23 20:42:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Derive javaVersion from downloadUrl.

Browse Source 
This ensures that `latest-ea` and `22-ea` can be cached based on the actual version number (e.g., `22.0.0`).
This commit is contained in:
Fabio Niephaus 2024-02-22 10:24:27 +01:00 committed by Fabio Niephaus
parent cb063c121c
commit f6947ecb49
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93862,12 +93862,18 @@ function setUpGraalVMJDK(javaVersionOrDev) {
if (javaVersionOrDev === c.VERSION_DEV) { if (javaVersionOrDev === c.VERSION_DEV) {
return setUpGraalVMJDKDevBuild(); return setUpGraalVMJDKDevBuild();
} }
const javaVersion = javaVersionOrDev; let javaVersion = javaVersionOrDev;
const toolName = determineToolName(javaVersion, false); const toolName = determineToolName(javaVersion, false);
let downloadName = toolName; let downloadName = toolName;
let downloadUrl; let downloadUrl;
if (javaVersion.endsWith('-ea')) { if (javaVersion.endsWith('-ea')) {
downloadUrl = yield findLatestEABuildDownloadUrl(javaVersion); downloadUrl = yield findLatestEABuildDownloadUrl(javaVersion);
const filename = (0, path_1.basename)(downloadUrl);
const resolvedVersion = semver.valid(semver.coerce(filename));
if (!resolvedVersion) {
throw new Error(`Unable to determine resolved version based on '${filename}'. ${c.ERROR_REQUEST}`);
}
javaVersion = resolvedVersion;
} }
else if (javaVersion.includes('.')) { else if (javaVersion.includes('.')) {
if (semver.valid(javaVersion)) { if (semver.valid(javaVersion)) {

10
src/graalvm.ts
View File

@ -28,12 +28,20 @@ export async function setUpGraalVMJDK(
if (javaVersionOrDev === c.VERSION_DEV) { if (javaVersionOrDev === c.VERSION_DEV) {
return setUpGraalVMJDKDevBuild() return setUpGraalVMJDKDevBuild()
} }
const javaVersion = javaVersionOrDev let javaVersion = javaVersionOrDev
const toolName = determineToolName(javaVersion, false) const toolName = determineToolName(javaVersion, false)
let downloadName = toolName let downloadName = toolName
let downloadUrl: string let downloadUrl: string
if (javaVersion.endsWith('-ea')) { if (javaVersion.endsWith('-ea')) {
downloadUrl = await findLatestEABuildDownloadUrl(javaVersion) downloadUrl = await findLatestEABuildDownloadUrl(javaVersion)
const filename = basename(downloadUrl)
const resolvedVersion = semver.valid(semver.coerce(filename))
if (!resolvedVersion) {
throw new Error(
`Unable to determine resolved version based on '${filename}'. ${c.ERROR_REQUEST}`
)
}
javaVersion = resolvedVersion
} else if (javaVersion.includes('.')) { } else if (javaVersion.includes('.')) {
if (semver.valid(javaVersion)) { if (semver.valid(javaVersion)) {
const majorJavaVersion = semver.major(javaVersion) const majorJavaVersion = semver.major(javaVersion)