[windows] Add windows-11-arm64 image generation code (#13879)
This commit is contained in:
@@ -19,8 +19,8 @@ function Set-JavaPath {
|
||||
exit 1
|
||||
}
|
||||
|
||||
Write-Host "Set 'JAVA_HOME_${Version}_X64' environmental variable as $javaPath"
|
||||
[Environment]::SetEnvironmentVariable("JAVA_HOME_${Version}_X64", $javaPath, "Machine")
|
||||
Write-Host "Set 'JAVA_HOME_${Version}_$($Architecture.ToUpper())' environmental variable as $javaPath"
|
||||
[Environment]::SetEnvironmentVariable("JAVA_HOME_${Version}_$($Architecture.ToUpper())", $javaPath, "Machine")
|
||||
|
||||
if ($Default) {
|
||||
# Clean up any other Java folders from PATH to make sure that they won't conflict with each other
|
||||
@@ -91,6 +91,12 @@ function Install-JavaJDK {
|
||||
New-Item -ItemType File -Path $javaVersionPath -Name "$Architecture.complete" | Out-Null
|
||||
}
|
||||
|
||||
if (Test-IsArm64) {
|
||||
$javaArch = "aarch64"
|
||||
} else {
|
||||
$javaArch = "x64"
|
||||
}
|
||||
|
||||
$toolsetJava = (Get-ToolsetContent).java
|
||||
$defaultVersion = $toolsetJava.default
|
||||
$jdkVersionsToInstall = $toolsetJava.versions
|
||||
@@ -98,12 +104,12 @@ $jdkVersionsToInstall = $toolsetJava.versions
|
||||
foreach ($jdkVersionToInstall in $jdkVersionsToInstall) {
|
||||
$isDefaultVersion = $jdkVersionToInstall -eq $defaultVersion
|
||||
|
||||
Install-JavaJDK -JDKVersion $jdkVersionToInstall
|
||||
Install-JavaJDK -JDKVersion $jdkVersionToInstall -Architecture $javaArch
|
||||
|
||||
if ($isDefaultVersion) {
|
||||
Set-JavaPath -Version $jdkVersionToInstall -Default
|
||||
Set-JavaPath -Version $jdkVersionToInstall -Architecture $javaArch -Default
|
||||
} else {
|
||||
Set-JavaPath -Version $jdkVersionToInstall
|
||||
Set-JavaPath -Version $jdkVersionToInstall -Architecture $javaArch
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user