diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index d1ac84e6..cb740aae 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -176,15 +176,10 @@ $toolsList += @( (Get-GHCupVersion), (Get-GHCVersion), (Get-CabalVersion), - (Get-StackVersion) + (Get-StackVersion), + (Get-SwiftFormatVersion) ) -if($os.IsLessThanMonterey) { - $toolsList += @( - (Get-SwiftFormatVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) # Linters diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 77788ad7..21f6de5e 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -30,7 +30,7 @@ Describe "Subversion" { } } -Describe "SwiftFormat" -Skip:($os.IsMonterey) { +Describe "SwiftFormat" { It "SwiftFormat" { "swiftformat --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index ce56009f..84dc9a6a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -127,6 +127,7 @@ "perl", "sbt", "subversion", + "swiftformat", "swig", "zstd", "gmp",