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

Fix GraalVM for JDK 17+ detection in MSVC feature.

Browse Source 
Fixes #88
This commit is contained in:
Fabio Niephaus 2024-03-11 22:34:51 +01:00 committed by Fabio Niephaus
parent 5393c3d809
commit b03aef7455
3 changed files with 11 additions and 12 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.

10
src/main.ts
View File

@ -30,9 +30,15 @@ async function run(): Promise<void> {
const enableCheckForUpdates = const enableCheckForUpdates =
core.getInput(c.INPUT_CHECK_FOR_UPDATES) === 'true' core.getInput(c.INPUT_CHECK_FOR_UPDATES) === 'true'
const enableNativeImageMusl = core.getInput(c.INPUT_NI_MUSL) === 'true' const enableNativeImageMusl = core.getInput(c.INPUT_NI_MUSL) === 'true'
const isGraalVMforJDK17OrLater =
distribution.length > 0 || graalVMVersion.length == 0
if (c.IS_WINDOWS) { if (c.IS_WINDOWS) {
setUpWindowsEnvironment(javaVersion, graalVMVersion) setUpWindowsEnvironment(
javaVersion,
graalVMVersion,
isGraalVMforJDK17OrLater
)
} }
await setUpDependencies(components) await setUpDependencies(components)
if (enableNativeImageMusl) { if (enableNativeImageMusl) {
@ -40,8 +46,6 @@ async function run(): Promise<void> {
} }
// Download GraalVM JDK // Download GraalVM JDK
const isGraalVMforJDK17OrLater =
distribution.length > 0 || graalVMVersion.length == 0
let graalVMHome let graalVMHome
if (isGraalVMforJDK17OrLater) { if (isGraalVMforJDK17OrLater) {
if ( if (

13
src/msvc.ts
View File

@ -30,18 +30,13 @@ function findVcvarsallPath(): string {
export function setUpWindowsEnvironment( export function setUpWindowsEnvironment(
javaVersion: string, javaVersion: string,
graalVMVersion: string graalVMVersion: string,
isGraalVMforJDK17OrLater: boolean
): void { ): void {
if (javaVersion === javaVersion || graalVMVersion === VERSION_DEV) { if (javaVersion === javaVersion || graalVMVersion === VERSION_DEV) {
return // no longer required in dev builds return // no longer required in dev builds
} } else if (isGraalVMforJDK17OrLater) {
const javaVersionSemVer = semver.coerce(javaVersion) return // no longer required in GraalVM for JDK 17 and later.
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
} }
core.startGroup('Updating Windows environment...') core.startGroup('Updating Windows environment...')