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

[MacOS] Move preinstalled java distributions to the toolcache directory (#2883)

Browse Source 
* Move java to the toolcache

* resolved comments

* added sudo for ln command

* fixed versions and added symlink

* fixed openjdk.sh

* fixed typo

* updated SoftwareReport

* fixed SoftwareReport

* fixed SoftwareReport

* fixed tool name

Co-authored-by: Nikita Bykov <v-nibyko@microsoft.com>
This commit is contained in:
Nikita Bykov
2021-03-16 17:13:54 +03:00
committed by GitHub
parent 758e6ef267
commit ef6e8c905f
3 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/macos/tests/Java.Tests.ps1
View File

@@ -35,15 +35,7 @@ Describe "Java" {
"/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode
}
if ($_.Title -ne "Default") {
It "Version is valid" -TestCases $_ {
$javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home"
$javaBinPath = Join-Path $javaRootPath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
}
}
It "<EnvVariable>" -TestCases $_ {
It "Java <Version>" -TestCases $_ {
$envVariablePath = Get-EnvironmentVariable $EnvVariable
$javaBinPath = Join-Path $envVariablePath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version