Derive javaVersion from downloadUrl.

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

View File

@@ -28,12 +28,20 @@ export async function setUpGraalVMJDK(
if (javaVersionOrDev === c.VERSION_DEV) {
return setUpGraalVMJDKDevBuild()
}
const javaVersion = javaVersionOrDev
let javaVersion = javaVersionOrDev
const toolName = determineToolName(javaVersion, false)
let downloadName = toolName
let downloadUrl: string
if (javaVersion.endsWith('-ea')) {
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('.')) {
if (semver.valid(javaVersion)) {
const majorJavaVersion = semver.major(javaVersion)