Fix and test check for MSVC setup.
This commit is contained in:
committed by
Fabio Niephaus
parent
b03aef7455
commit
d3f9e14fc3
25
src/msvc.ts
25
src/msvc.ts
@@ -28,15 +28,32 @@ function findVcvarsallPath(): string {
|
||||
throw new Error('Failed to find vcvarsall.bat')
|
||||
}
|
||||
|
||||
export function needsWindowsEnvironmentSetup(
|
||||
javaVersion: string,
|
||||
graalVMVersion: string,
|
||||
isGraalVMforJDK17OrLater: boolean
|
||||
): boolean {
|
||||
if (javaVersion === VERSION_DEV || graalVMVersion === VERSION_DEV) {
|
||||
return false // no longer required in dev builds
|
||||
} else if (isGraalVMforJDK17OrLater) {
|
||||
return false // no longer required in GraalVM for JDK 17 and later.
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
export function setUpWindowsEnvironment(
|
||||
javaVersion: string,
|
||||
graalVMVersion: string,
|
||||
isGraalVMforJDK17OrLater: boolean
|
||||
): void {
|
||||
if (javaVersion === javaVersion || graalVMVersion === VERSION_DEV) {
|
||||
return // no longer required in dev builds
|
||||
} else if (isGraalVMforJDK17OrLater) {
|
||||
return // no longer required in GraalVM for JDK 17 and later.
|
||||
if (
|
||||
!needsWindowsEnvironmentSetup(
|
||||
javaVersion,
|
||||
graalVMVersion,
|
||||
isGraalVMforJDK17OrLater
|
||||
)
|
||||
) {
|
||||
return
|
||||
}
|
||||
|
||||
core.startGroup('Updating Windows environment...')
|
||||
|
||||
Reference in New Issue
Block a user