actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-18 15:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Add SwiftFormat for macOS 12 (#5495)

Browse Source 
* Add SwiftFormat for macOS 12

* Update docs and pester test
This commit is contained in:
Aleksandr Chebotov
2022-05-06 09:15:33 +02:00
committed by GitHub
parent df8580f2f0
commit 17e6dc8298
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -176,14 +176,9 @@ $toolsList += @(
(Get-GHCupVersion), (Get-GHCupVersion),
(Get-GHCVersion), (Get-GHCVersion),
(Get-CabalVersion), (Get-CabalVersion),
(Get-StackVersion) (Get-StackVersion),
)
if($os.IsLessThanMonterey) {
$toolsList += @(
(Get-SwiftFormatVersion) (Get-SwiftFormatVersion)
) )
}
$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object)

2
images/macos/tests/BasicTools.Tests.ps1
View File

@@ -30,7 +30,7 @@ Describe "Subversion" {
} }
} }
Describe "SwiftFormat" -Skip:($os.IsMonterey) { Describe "SwiftFormat" {
It "SwiftFormat" { It "SwiftFormat" {
"swiftformat --version" | Should -ReturnZeroExitCode "swiftformat --version" | Should -ReturnZeroExitCode
} }

1
images/macos/toolsets/toolset-12.json
View File

@@ -127,6 +127,7 @@
"perl", "perl",
"sbt", "sbt",
"subversion", "subversion",
"swiftformat",
"swig", "swig",
"zstd", "zstd",
"gmp", "gmp",