Skip to content

Commit ec83a5c

Browse files
authored
Merge pull request #539 from danger/fix_commit_script
Fix release script
2 parents b3645a7 + 0a51bdc commit ec83a5c

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

Package.swift

+2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ let package = Package(
7878
"tag",
7979
"push",
8080
"Scripts/change_is_develop.sh true",
81+
"git_add",
8182
["commit": ["message": "Enable dev depdendencies"]],
83+
"push",
8284
"Scripts/create_homebrew_tap.sh",
8385
],
8486
],

Sources/DangerDependenciesResolver/PackageGenerator.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct PackageGenerator {
8181
func makeSupportedPlatform(forMacOSVersion macOSVersion: Version) -> String {
8282
if case .null = macOSVersion { return "" }
8383
switch macOSVersion.major {
84-
case 10 where (10...15).contains(macOSVersion.minor):
84+
case 10 where (10 ... 15).contains(macOSVersion.minor):
8585
return ".macOS(.v10_\(macOSVersion.minor))"
8686
case 11...:
8787
return ".macOS(.v\(macOSVersion.major))"

Sources/DangerDependenciesResolver/PackageManager.swift

+13-13
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,20 @@ public struct PackageManager {
186186

187187
private func resolveMacOSVersion(executor: ShellExecutor) -> Version {
188188
#if os(macOS)
189-
var versionString = executor.execute("sw_vers",
190-
arguments: ["-productVersion"])
191-
versionString = versionString.onlyNumbersAndDots ?? versionString
192-
switch versionString.components(separatedBy: ".").count {
193-
case 1:
194-
versionString += ".0.0"
195-
case 2:
196-
versionString += ".0"
197-
default:
198-
break
199-
}
200-
return Version(versionString) ?? .null
189+
var versionString = executor.execute("sw_vers",
190+
arguments: ["-productVersion"])
191+
versionString = versionString.onlyNumbersAndDots ?? versionString
192+
switch versionString.components(separatedBy: ".").count {
193+
case 1:
194+
versionString += ".0.0"
195+
case 2:
196+
versionString += ".0"
197+
default:
198+
break
199+
}
200+
return Version(versionString) ?? .null
201201
#else
202-
return .null
202+
return .null
203203
#endif
204204
}
205205
}

0 commit comments

Comments
 (0)