mirror of
https://github.com/graalvm/setup-graalvm.git
synced 2024-10-16 07:43:20 +08:00
parent
5393c3d809
commit
b03aef7455
BIN
dist/main/index.js
generated
vendored
BIN
dist/main/index.js
generated
vendored
Binary file not shown.
10
src/main.ts
10
src/main.ts
@ -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
13
src/msvc.ts
@ -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...')
|
||||||
|
Loading…
Reference in New Issue
Block a user