Merge pull request #3250 from SwiftPackageIndex/improve-build-details

Improve build details

Author: daveverwer

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

@@ -67,6 +67,7 @@ extension BuildShow {
         var swiftVersion: SwiftVersion
         var buildDate: Date?
         var commitHash: String?
+        var swift6ErrorCount: Int?
 
         init?(build: App.Build, logs: String?) {
             guard let swiftVersion = build.swiftVersion.compatibility else { return nil }
@@ -76,7 +77,8 @@ extension BuildShow {
                       status: build.status,
                       swiftVersion: swiftVersion,
                       buildDate: build.buildDate,
-                      commitHash: build.commitHash)
+                      commitHash: build.commitHash,
+                      swift6ErrorCount: build.buildErrors?.numSwift6Errors)
         }
 
         internal init(buildCommand: String,
@@ -85,14 +87,16 @@ extension BuildShow {
                       status: App.Build.Status,
                       swiftVersion: SwiftVersion,
                       buildDate: Date? = nil,
-                      commitHash: String? = nil) {
+                      commitHash: String? = nil,
+                      swift6ErrorCount: Int?) {
             self.buildCommand = buildCommand
             self.logs = logs
             self.platform = platform
             self.status = status
             self.swiftVersion = swiftVersion
             self.buildDate = buildDate
             self.commitHash = commitHash
+            self.swift6ErrorCount = swift6ErrorCount
         }
 
         var xcodeVersion: String? {

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

@@ -70,6 +70,15 @@ enum BuildShow {
                         .href(model.packageURL),
                         .text(model.packageName)
                     ),
+                    .unwrap(model.buildInfo.buildDetails) {
+                        .group(
+                            .text(", reference "),
+                            .strong("\(model.reference)"),
+                            .text(" ("),
+                            .code("\($0.commitHash.prefix(6))"),
+                            .text("),")
+                        )
+                    },
                     .text(" with "),
                     .strong(
                         .text(model.buildInfo.swiftVersion.longDisplayName),
@@ -86,20 +95,20 @@ enum BuildShow {
                     .unwrap(model.buildInfo.xcodeVersion) {
                         .group(
                             .text(" using "),
-                            .strong(.text($0)),
-                            .text(" at "),
-                            .strong(.text(model.reference))
+                            .strong(.text($0))
                         )
                     },
                     .unwrap(model.buildInfo.buildDetails) {
                         .group(
-                            .text(" (\($0.commitHash.prefix(6)))"),
                             .text(" on "),
                             .strong(.text(DateFormatter.utcFullDateTimeDateFormatter.string(from: $0.buildDate) + " UTC"))
                         )
                     },
                     .text(".")
                 ),
+                .unwrap(model.buildInfo.swift6ErrorCount) {
+                    .p(.strong("Swift 6 data race errors: \($0)"))
+                },
                 .h3("Build Command"),
                 .pre(
                     .code(

Tests/AppTests/Mocks/BuildShow+mock.swift

@@ -26,7 +26,8 @@ extension BuildShow.Model {
                              status: .ok,
                              swiftVersion: .v2,
                              buildDate: .t0,
-                             commitHash: "71b4d8e3445caa8623fa65169f83eae2a6111925"),
+                             commitHash: "71b4d8e3445caa8623fa65169f83eae2a6111925",
+                             swift6ErrorCount: nil),
             packageName: "Bar",
             repositoryOwner: "foo",
             repositoryOwnerName: "Foo",

Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_BuildShow.1.html

@@ -102,11 +102,12 @@ <h1>
           <h2>Build Information</h2>
           <p>
             <strong class="green">Successful</strong> build of 
-            <a href="/foo/bar">Bar</a> with 
+            <a href="/foo/bar">Bar</a>, reference 
+            <strong>main</strong> (
+            <code>71b4d8</code>), with 
             <strong>Swift 5.9</strong> for 
             <strong>iOS</strong> using 
-            <strong>Xcode 15.2</strong> at 
-            <strong>main</strong> (71b4d8) on 
+            <strong>Xcode 15.2</strong> on 
             <strong>1 Jan 1970 00:00:00 UTC</strong>.
           </p>
           <h3>Build Command</h3>