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`).
graalvm · Feb 22, 2024 · 4a6d7d1 · 4a6d7d1
1 parent 1065053
commit 4a6d7d1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/src/graalvm.ts b/src/graalvm.ts
@@ -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)