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

[mac OS] Remove AdoptOpenJDK (#8025)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-08-03 10:42:41 +02:00
committed by GitHub
parent 974c7589b9
commit 89acd994b2
6 changed files with 22 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,13 +27,8 @@ Describe "Java" -Skip:($os.IsVenturaArm64) {
$toolsetJava = Get-ToolsetValue "java"
$defaultVersion = $toolsetJava.default
$defaultVendor = $toolsetJava.default_vendor
$javaVendors = $toolsetJava.vendors
$jdkVersions = $toolsetJava.versions
[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" }
@@ -57,17 +52,6 @@ Describe "Java" -Skip:($os.IsVenturaArm64) {
}
}
Context "Java Adopt" {
Describe "Java Adopt" -Skip:($os.IsVentura -or $os.IsVenturaArm64) {
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" {