diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 2c36fd4da..2012f889c 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -596,4 +596,9 @@ function Get-CodeQLBundleVersion { $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" $CodeQLVersion = & $CodeQLPath version --quiet return "CodeQL Action Bundle $CodeQLVersion" -} \ No newline at end of file +} + +function Get-ColimaVersion { + $colimaVersion = Run-Command "colima version" | Select-String "colima version" | Take-Part -Part 2 + return "Colima $colimaVersion" +} diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index d3e43733c..3169e4338 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -182,7 +182,8 @@ $toolsList += @( (Get-GHCVersion), (Get-CabalVersion), (Get-StackVersion), - (Get-SwiftFormatVersion) + (Get-SwiftFormatVersion), + (Get-ColimaVersion) ) $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 9ae2eaa9c..0aaf45ecc 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -149,4 +149,10 @@ Describe "CodeQL" -Skip:($os.IsCatalina) { $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" $CodeQLPacksPath | Should -Exist } -} \ No newline at end of file +} + +Describe "Colima" { + It "Colima" { + "colima version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 51e7f8d61..0b6e2f9fc 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -205,6 +205,7 @@ "bazelisk", "carthage", "cmake", + "colima", "gh", "gnupg", "gnu-tar", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 4d41f9cc9..b45343442 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -155,6 +155,7 @@ "bazelisk", "carthage", "cmake", + "colima", "gh", "gnupg", "gnu-tar",