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

[MacOS] Add Adoptium to Java installer (#4116)

Browse Source
This commit is contained in:
Mikhail Koliada
2021-09-22 15:38:39 +03:00
committed by GitHub
parent f30be61034
commit 75380ebaa3
6 changed files with 116 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,11 +23,17 @@ Describe "Java" {
}
}
$versionsList = Get-ToolsetValue "java.versions"
$defaultJava = Get-ToolsetValue "java.default"
$toolsetJava = Get-ToolsetValue "java"
$defaultVersion = $toolsetJava.default
$defaultVendor = $toolsetJava.default_vendor
$javaVendors = $toolsetJava.vendors
$testCases = $versionsList | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } }
$testCases += @{ Title = "Default"; Version = (Get-NativeVersionFormat $defaultJava); EnvVariable = "JAVA_HOME" }
[array]$jdkVersions = ($javaVendors | Where-Object {$_.name -eq $defaultVendor}).versions
[array]$adoptJdkVersions = ($javaVendors | Where-Object {$_.name -eq "Adopt"}).versions
$adoptCases = $adoptJdkVersions | ForEach-Object { @{Version = $_} }
$testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } }
$testCases += @{ Title = "Default"; Version = (Get-NativeVersionFormat $defaultVersion); EnvVariable = "JAVA_HOME" }
$testCases | ForEach-Object {
Context $_.Title {
@@ -49,6 +55,17 @@ Describe "Java" {
}
}
Context "Java Adopt" {
Describe "Java Adopt" {
It "Java Adopt <Version>" -TestCases $adoptCases {
$adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\Contents\Home\bin\java"
$result = Get-CommandResult "`"$adoptPath`" -version"
$result.ExitCode | Should -Be 0
}
}
}
Context "Maven" {
Describe "Maven" {
It "Maven" {