mirror of
https://github.com/actions/runner-images-sangeeth.git
synced 2025-12-20 06:29:50 +00:00
Enable Java tests since Java switching was fixed in MacOS 11.0 beta 9
This commit is contained in:
@@ -80,6 +80,7 @@ $homebrewVersion = Run-Command "brew --version" | Select-Object -First 1
|
||||
$npmVersion = Run-Command "npm --version"
|
||||
$yarnVersion = Run-Command "yarn --version"
|
||||
$nugetVersion = Run-Command "nuget help" | Select-Object -First 1 | Take-Part -Part 2
|
||||
$pipVersion = Get-PipVersion -Version 2
|
||||
$pip3Version = Get-PipVersion -Version 3
|
||||
$condaVersion = Invoke-Expression "conda --version"
|
||||
$rubyGemsVersion = Run-Command "gem --version"
|
||||
@@ -90,12 +91,9 @@ if ($os.IsHigherThanMojave) {
|
||||
$vcpkgVersion = Get-VcpkgVersion
|
||||
$markdown += New-MDList -Lines $vcpkgVersion -Style Unordered -NoNewLine
|
||||
}
|
||||
if ($os.IsLessThanBigSur) {
|
||||
$pipVersion = Get-PipVersion -Version 2
|
||||
$markdown += New-MDList -Style Unordered -Lines @("Pip ${pipVersion}") -NoNewLine
|
||||
}
|
||||
|
||||
$markdown += New-MDList -Style Unordered -Lines @(
|
||||
"Pip ${pipVersion}",
|
||||
"Pip ${pip3Version}",
|
||||
$bundlerVersion,
|
||||
"Carthage ${carthageVersion}",
|
||||
|
||||
@@ -11,7 +11,7 @@ function Get-NativeVersionFormat {
|
||||
return $Version
|
||||
}
|
||||
|
||||
Describe "Java" -Skip:($os.IsBigSur) {
|
||||
Describe "Java" {
|
||||
BeforeAll {
|
||||
function Validate-JavaVersion {
|
||||
param($JavaCommand, $ExpectedVersion)
|
||||
|
||||
@@ -12,7 +12,7 @@ Describe "Python" {
|
||||
(Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*"
|
||||
}
|
||||
|
||||
It "Python 2 is installed under /usr/local/bin" -Skip:($os.IsBigSur) {
|
||||
It "Python 2 is installed under /usr/local/bin" {
|
||||
Get-WhichTool "python" | Should -BeLike "/usr/local/bin*"
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ Describe "Python" {
|
||||
Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*"
|
||||
}
|
||||
|
||||
It "Pip 2 is available" -Skip:($os.IsBigSur) {
|
||||
It "Pip 2 is available" {
|
||||
"pip --version" | Should -ReturnZeroExitCode
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user