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] Remove Java 7 (#2631)

Browse Source 
* remove java 7

* remove unused function
This commit is contained in:
Dibir Magomedsaygitov
2021-02-07 20:09:22 +03:00
committed by GitHub
parent 33d4c0213f
commit dad0901d33
6 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
function Get-NativeVersionFormat {
param($Version)
if ($Version -in "7", "8") {
if ($Version -in "8") {
return "1.${Version}"
}
return $Version
@@ -38,7 +38,6 @@ Describe "Java" {
if ($_.Title -ne "Default") {
It "Version is valid" -TestCases $_ {
$javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home"
if ($Title -eq "7") { $javaRootPath = "/Library/Java/JavaVirtualMachines/zulu-7.jdk/Contents/Home" }
$javaBinPath = Join-Path $javaRootPath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
}