actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-12 03:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Fix java 11 installation (#887)

Browse Source 
* Fix java 11 installation, add tests

* change java installation to use function

* remove extra line
This commit is contained in:
Mikhail Timofeev
2020-05-16 12:31:21 +03:00
committed by GitHub
parent 5160bfa626
commit a8f49b6630
2 changed files with 96 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
images/win/scripts/Installers/Install-JavaTools.ps1
View File

@@ -5,6 +5,44 @@
Import-Module -Name ImageHelpers -Force
function Set-JavaPath {
param (
[string] $Version,
[switch] $Default
)
$filter = "*azure-jdk_${version}.*"
$javaPath = (Get-ChildItem -Path 'C:\Program Files\Java' -Filter $filter | Sort-Object -Property Name -Descending | Select-Object -First 1).FullName
Write-Host "Set JAVA_HOME_${Version}_X64 environmental variable as $javaPath"
setx JAVA_HOME_${Version}_X64 $javaPath /M
if ($Default)
{
$currentPath = Get-MachinePath
$pathSegments = $currentPath.Split(';')
$newPathSegments = @()
foreach ($pathSegment in $pathSegments)
{
if ($pathSegment -notlike '*java*')
{
$newPathSegments += $pathSegment
}
}
$newPath = [string]::Join(';', $newPathSegments)
$newPath = $javaPath + '\bin;' + $newPath
Write-Host "Add $javaPath\bin to PATH"
Set-MachinePath -NewPath $newPath
Write-Host "Set JAVA_HOME environmental variable as $javaPath"
setx JAVA_HOME $javaPath /M
}
}
# Download the Azul Systems Zulu JDKs
# See https://www.azul.com/downloads/azure-only/zulu/
$azulJDKURLs = @(
@@ -17,44 +55,14 @@ $azulJDKURLs = @(
foreach ($azulJDKURL in $azulJDKURLs)
{
$archivePath = Start-DownloadWithRetry -Url $azulJDKURL -Name $([IO.Path]::GetFileName($azulJDKURL))
Expand-Archive -Path $archivePath -DestinationPath "C:\Program Files\Java\"
Extract-7Zip -Path $archivePath -DestinationPath "C:\Program Files\Java\"
}
$currentPath = Get-MachinePath
$pathSegments = $currentPath.Split(';')
$newPathSegments = @()
foreach ($pathSegment in $pathSegments)
{
if ($pathSegment -notlike '*java*')
{
$newPathSegments += $pathSegment
}
}
$java7Installs = Get-ChildItem -Path 'C:\Program Files\Java' -Filter '*azure-jdk*7*' | Sort-Object -Property Name -Descending | Select-Object -First 1
$latestJava7Install = $java7Installs.FullName;
$java8Installs = Get-ChildItem -Path 'C:\Program Files\Java' -Filter '*azure-jdk*8*' | Sort-Object -Property Name -Descending | Select-Object -First 1
$latestJava8Install = $java8Installs.FullName;
$java11Installs = Get-ChildItem -Path 'C:\Program Files\Java' -Filter '*azure-jdk*11*' | Sort-Object -Property Name -Descending | Select-Object -First 1
$latestJava11Install = $java11Installs.FullName;
$java13Installs = Get-ChildItem -Path 'C:\Program Files\Java' -Filter '*azure-jdk*13*' | Sort-Object -Property Name -Descending | Select-Object -First 1
$latestJava13Install = $java13Installs.FullName;
$newPath = [string]::Join(';', $newPathSegments)
$newPath = $latestJava8Install + '\bin;' + $newPath
Set-MachinePath -NewPath $newPath
setx JAVA_HOME $latestJava8Install /M
setx JAVA_HOME_7_X64 $latestJava7Install /M
setx JAVA_HOME_8_X64 $latestJava8Install /M
setx JAVA_HOME_11_X64 $latestJava11Install /M
setx JAVA_HOME_13_X64 $latestJava13Install /M
# Set PATH and env variables
Set-JavaPath -Version 7
Set-JavaPath -Version 8 -Default
Set-JavaPath -Version 11
Set-JavaPath -Version 13
# Install Java tools
# Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK