mirror of
https://github.com/actions/runner-images.git
synced 2025-12-15 14:17:22 +00:00
[macOS] Add Colima tool (#6285)
* Add Colima tool to macos images * PR fixes: skip Catalina; switch to toolset json
This commit is contained in:
committed by
GitHub
parent
00b572dfdf
commit
ab4f43d818
@@ -596,4 +596,9 @@ function Get-CodeQLBundleVersion {
|
|||||||
$CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql"
|
$CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql"
|
||||||
$CodeQLVersion = & $CodeQLPath version --quiet
|
$CodeQLVersion = & $CodeQLPath version --quiet
|
||||||
return "CodeQL Action Bundle $CodeQLVersion"
|
return "CodeQL Action Bundle $CodeQLVersion"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function Get-ColimaVersion {
|
||||||
|
$colimaVersion = Run-Command "colima version" | Select-String "colima version" | Take-Part -Part 2
|
||||||
|
return "Colima $colimaVersion"
|
||||||
|
}
|
||||||
|
|||||||
@@ -182,7 +182,8 @@ $toolsList += @(
|
|||||||
(Get-GHCVersion),
|
(Get-GHCVersion),
|
||||||
(Get-CabalVersion),
|
(Get-CabalVersion),
|
||||||
(Get-StackVersion),
|
(Get-StackVersion),
|
||||||
(Get-SwiftFormatVersion)
|
(Get-SwiftFormatVersion),
|
||||||
|
(Get-ColimaVersion)
|
||||||
)
|
)
|
||||||
|
|
||||||
$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object)
|
$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object)
|
||||||
|
|||||||
@@ -149,4 +149,10 @@ Describe "CodeQL" -Skip:($os.IsCatalina) {
|
|||||||
$CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks"
|
$CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks"
|
||||||
$CodeQLPacksPath | Should -Exist
|
$CodeQLPacksPath | Should -Exist
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Describe "Colima" {
|
||||||
|
It "Colima" {
|
||||||
|
"colima version" | Should -ReturnZeroExitCode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -205,6 +205,7 @@
|
|||||||
"bazelisk",
|
"bazelisk",
|
||||||
"carthage",
|
"carthage",
|
||||||
"cmake",
|
"cmake",
|
||||||
|
"colima",
|
||||||
"gh",
|
"gh",
|
||||||
"gnupg",
|
"gnupg",
|
||||||
"gnu-tar",
|
"gnu-tar",
|
||||||
|
|||||||
@@ -155,6 +155,7 @@
|
|||||||
"bazelisk",
|
"bazelisk",
|
||||||
"carthage",
|
"carthage",
|
||||||
"cmake",
|
"cmake",
|
||||||
|
"colima",
|
||||||
"gh",
|
"gh",
|
||||||
"gnupg",
|
"gnupg",
|
||||||
"gnu-tar",
|
"gnu-tar",
|
||||||
|
|||||||
Reference in New Issue
Block a user