Skip to content

Commit 545c8b5

Browse files
committed
Add Swift 6 data race error count to build details page
1 parent 666ce2d commit 545c8b5

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

Sources/App/Views/PackageController/Builds/BuildShow+Model.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ extension BuildShow {
6767
var swiftVersion: SwiftVersion
6868
var buildDate: Date?
6969
var commitHash: String?
70+
var swift6ErrorCount: Int?
7071

7172
init?(build: App.Build, logs: String?) {
7273
guard let swiftVersion = build.swiftVersion.compatibility else { return nil }
@@ -76,7 +77,8 @@ extension BuildShow {
7677
status: build.status,
7778
swiftVersion: swiftVersion,
7879
buildDate: build.buildDate,
79-
commitHash: build.commitHash)
80+
commitHash: build.commitHash,
81+
swift6ErrorCount: build.buildErrors?.numSwift6Errors)
8082
}
8183

8284
internal init(buildCommand: String,
@@ -85,14 +87,16 @@ extension BuildShow {
8587
status: App.Build.Status,
8688
swiftVersion: SwiftVersion,
8789
buildDate: Date? = nil,
88-
commitHash: String? = nil) {
90+
commitHash: String? = nil,
91+
swift6ErrorCount: Int?) {
8992
self.buildCommand = buildCommand
9093
self.logs = logs
9194
self.platform = platform
9295
self.status = status
9396
self.swiftVersion = swiftVersion
9497
self.buildDate = buildDate
9598
self.commitHash = commitHash
99+
self.swift6ErrorCount = swift6ErrorCount
96100
}
97101

98102
var xcodeVersion: String? {

Sources/App/Views/PackageController/Builds/BuildShow+View.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ enum BuildShow {
106106
},
107107
.text(".")
108108
),
109+
.unwrap(model.buildInfo.swift6ErrorCount) {
110+
.p(.strong("Swift 6 data race errors: \($0)"))
111+
},
109112
.h3("Build Command"),
110113
.pre(
111114
.code(

Tests/AppTests/Mocks/BuildShow+mock.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ extension BuildShow.Model {
2626
status: .ok,
2727
swiftVersion: .v2,
2828
buildDate: .t0,
29-
commitHash: "71b4d8e3445caa8623fa65169f83eae2a6111925"),
29+
commitHash: "71b4d8e3445caa8623fa65169f83eae2a6111925",
30+
swift6ErrorCount: nil),
3031
packageName: "Bar",
3132
repositoryOwner: "foo",
3233
repositoryOwnerName: "Foo",

0 commit comments

Comments
 (0)