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

[Windows] Remove AdoptOpenJDK (#8026)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-08-03 10:32:48 +02:00
committed by GitHub
parent e1d1163c15
commit 974c7589b9
5 changed files with 27 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
images/win/scripts/Tests/Java.Tests.ps1
View File

@@ -1,11 +1,9 @@
Describe "Java" {
$toolsetJava = (Get-ToolsetContent).java
$defaultVendor = $toolsetJava.default_vendor
$javaVendors = $toolsetJava.vendors
$defaultVersion = $toolsetJava.default
$jdkVersions = $toolsetJava.versions
[array]$jdkVersions = ($javaVendors | Where-Object {$_.name -eq $defaultVendor}).versions | ForEach-Object { @{Version = $_} }
[array]$adoptJdkVersions = ($javaVendors | Where-Object {$_.name -eq "Adopt"}).versions | ForEach-Object { @{Version = $_} }
[array]$testCases = $jdkVersions | ForEach-Object { @{Version = $_ } }
It "Java <DefaultJavaVersion> is default" -TestCases @(@{ DefaultJavaVersion = $defaultVersion }) {
$actualJavaPath = Get-EnvironmentVariable "JAVA_HOME"
@@ -25,7 +23,7 @@ Describe "Java" {
"$ToolName -version" | Should -ReturnZeroExitCode
}
It "Java <Version>" -TestCases $jdkVersions {
It "Java <Version>" -TestCases $testCases {
$javaVariableValue = Get-EnvironmentVariable "JAVA_HOME_${Version}_X64"
$javaVariableValue | Should -Not -BeNullOrEmpty
$javaPath = Join-Path $javaVariableValue "bin\java"
@@ -39,17 +37,4 @@ Describe "Java" {
$outputPattern = "openjdk version `"${Version}"
$result.Output[0] | Should -Match $outputPattern
}
It "Java Adopt Jdk <Version>" -TestCases $adoptJdkVersions {
$adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java"
$result = Get-CommandResult "`"$adoptPath`" -version"
$result.ExitCode | Should -Be 0
if ($Version -eq 8) {
$Version = "1.${Version}"
}
$outputPattern = "openjdk version `"${Version}"
$result.Output[0] | Should -Match $outputPattern
}
}