Fix GraalVM for JDK 17+ detection in MSVC feature.

Fixes #88
graalvm · Mar 11, 2024 · 636adab · 636adab
1 parent 5393c3d
commit 636adab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/src/main.ts b/src/main.ts
@@ -30,18 +30,22 @@ async function run(): Promise<void> {
     const enableCheckForUpdates =
       core.getInput(c.INPUT_CHECK_FOR_UPDATES) === 'true'
     const enableNativeImageMusl = core.getInput(c.INPUT_NI_MUSL) === 'true'
+    const isGraalVMforJDK17OrLater =
+      distribution.length > 0 || graalVMVersion.length == 0
 
     if (c.IS_WINDOWS) {
-      setUpWindowsEnvironment(javaVersion, graalVMVersion)
+      setUpWindowsEnvironment(
+        javaVersion,
+        graalVMVersion,
+        isGraalVMforJDK17OrLater
+      )
     }
     await setUpDependencies(components)
     if (enableNativeImageMusl) {
       await setUpNativeImageMusl()
     }
 
     // Download GraalVM JDK
-    const isGraalVMforJDK17OrLater =
-      distribution.length > 0 || graalVMVersion.length == 0
     let graalVMHome
     if (isGraalVMforJDK17OrLater) {
       if (

diff --git a/src/msvc.ts b/src/msvc.ts
@@ -30,18 +30,13 @@ function findVcvarsallPath(): string {
 
 export function setUpWindowsEnvironment(
   javaVersion: string,
-  graalVMVersion: string
+  graalVMVersion: string,
+  isGraalVMforJDK17OrLater: boolean
 ): void {
   if (javaVersion === javaVersion || graalVMVersion === VERSION_DEV) {
     return // no longer required in dev builds
-  }
-  const javaVersionSemVer = semver.coerce(javaVersion)
-  if (
-    javaVersionSemVer &&
-    semver.valid(javaVersionSemVer) &&
-    semver.gte(javaVersionSemVer, '18.0.0')
-  ) {
-    return // no longer required in GraalVM for JDK 17 and later. JDK 17 builds from 22.3 still need this, so skip 17.X.X
+  } else if (isGraalVMforJDK17OrLater) {
+    return // no longer required in GraalVM for JDK 17 and later.
   }
 
   core.startGroup('Updating Windows environment...')