From 1de1e4a6173681f232aec4a83e52c2cee12dcd3b Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Tue, 1 Nov 2022 16:24:17 +0000 Subject: [PATCH 1/7] Added a `generatedDocs` parameter to the matrix build cell. --- .../PackageController/Builds/BuildIndex+Model.swift | 13 ++++++++----- Tests/AppTests/BuildIndexModelTests.swift | 11 +++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift b/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift index 82ec751ae..e71865de9 100644 --- a/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift +++ b/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift @@ -118,7 +118,8 @@ extension BuildIndex.Model { var column = [RowIndex: BuildCell]() for build in group.builds { guard let index = RowIndex(build) else { continue } - column[index] = .init(group.name, group.kind, build.id, build.status) + // TODO: Replace `generatedDocs: false` as part of #1888. + column[index] = .init(group.name, group.kind, build.id, build.status, generatedDocs: false) } RowIndex.all.forEach { values[$0, default: []] @@ -137,10 +138,12 @@ extension BuildIndex.Model { struct BuildCell: Equatable { var column: ColumnIndex var value: Value? + var generatedDocs: Bool? - init(_ column: String, _ kind: App.Version.Kind, _ id: App.Build.Id, _ status: Build.Status) { + init(_ column: String, _ kind: App.Version.Kind, _ id: App.Build.Id, _ status: Build.Status, generatedDocs: Bool) { self.column = .init(label: column, kind: kind) self.value = .init(id: id, status: status) + self.generatedDocs = generatedDocs } init(_ column: String, _ kind: App.Version.Kind) { @@ -156,8 +159,8 @@ extension BuildIndex.Model { let buildURL = SiteURL.builds(.value(value.id)).relativeURL() switch value.status { - case .ok: return cell(text: "Build Succeeded", linkURL: buildURL, cssClass: "succeeded") - case .failed: return cell(text: "Build Failed", linkURL: buildURL, cssClass: "failed") + case .ok: return cell(text: "Build Succeeded", linkURL: buildURL, cssClass: "succeeded", generatedDocs: generatedDocs) + case .failed: return cell(text: "Build Failed", linkURL: buildURL, cssClass: "failed", generatedDocs: generatedDocs) case .triggered: return cell(text: "Build Queued") case .infrastructureError: return cell(text: "Build Errored") case .timeout: return cell(text: "Build Timed Out") @@ -172,7 +175,7 @@ extension BuildIndex.Model { ) } - func cell(text: String, linkURL: String, cssClass: String) -> Node { + func cell(text: String, linkURL: String, cssClass: String, generatedDocs: Bool?) -> Node { return .div( .class(cssClass), .a( diff --git a/Tests/AppTests/BuildIndexModelTests.swift b/Tests/AppTests/BuildIndexModelTests.swift index de9eb2376..3114a5ead 100644 --- a/Tests/AppTests/BuildIndexModelTests.swift +++ b/Tests/AppTests/BuildIndexModelTests.swift @@ -169,10 +169,13 @@ class BuildIndexModelTests: AppTestCase { func test_BuildCell() throws { let id = UUID() - XCTAssertEqual(BuildCell("1.2.3", .release, id, .ok).node.render(), """ + XCTAssertEqual(BuildCell("1.2.3", .release, id, .ok, generatedDocs: false).node.render(), """
Build Succeeded
""") - XCTAssertEqual(BuildCell("1.2.3", .release, id, .failed).node.render(), """ + XCTAssertEqual(BuildCell("1.2.3", .release, id, .ok, generatedDocs: true).node.render(), """ +
Build Succeeded
+ """) + XCTAssertEqual(BuildCell("1.2.3", .release, id, .failed, generatedDocs: false).node.render(), """
Build Failed
""") XCTAssertEqual(BuildCell("1.2.3", .release).node.render(), """ @@ -184,9 +187,9 @@ class BuildIndexModelTests: AppTestCase { // setup let id = UUID() let bi = BuildItem(index: .init(swiftVersion: .v5_7, platform: .ios), - values: [.init("1.2.3", .release, id, .ok), + values: [.init("1.2.3", .release, id, .ok, generatedDocs: false), .init("2.0.0-b1", .preRelease), - .init("develop", .defaultBranch, id, .failed)]) + .init("develop", .defaultBranch, id, .failed, generatedDocs: false)]) // MUT - altogether now let node = bi.node From f6dae9f956fad3f104c4164732c14ce66121d468 Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Tue, 1 Nov 2022 16:25:02 +0000 Subject: [PATCH 2/7] Added the markup and styling for the new `generatedDocs` flag. --- FrontEnd/styles/colors.scss | 2 ++ FrontEnd/styles/matrix.scss | 18 ++++++++++++++++++ .../Builds/BuildIndex+Model.swift | 10 ++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/FrontEnd/styles/colors.scss b/FrontEnd/styles/colors.scss index b99f7195a..ea2979ebd 100644 --- a/FrontEnd/styles/colors.scss +++ b/FrontEnd/styles/colors.scss @@ -121,6 +121,7 @@ --grid-incompatible-background: var(--light-grey); --grid-succeeded-background: var(--very-light-grey); --grid-failed-background: var(--very-light-grey); + --grid-callout-background: var(--white); --package-list-border: var(--very-light-grey); --package-list-background: var(--very-very-light-grey); @@ -226,6 +227,7 @@ --grid-incompatible-background: var(--very-dark-grey); --grid-succeeded-background: var(--very-dark-grey); --grid-failed-background: var(--very-dark-grey); + --grid-callout-background: var(--black); --package-list-border: var(--very-dark-grey); --package-list-background: var(--very-very-dark-grey); diff --git a/FrontEnd/styles/matrix.scss b/FrontEnd/styles/matrix.scss index 07bb1ffe8..425ccd22b 100644 --- a/FrontEnd/styles/matrix.scss +++ b/FrontEnd/styles/matrix.scss @@ -150,6 +150,7 @@ } .results > div { + position: relative; background-color: var(--grid-default-background); &.succeeded > a, @@ -175,6 +176,23 @@ background-image: var(--image-build-failed); } } + + > .generated-docs { + position: absolute; + right: 5px; + display: inline-block; + width: 25px; + height: 25px; + background-position: center; + background-repeat: no-repeat; + background-size: 15px; + background-color: var(--grid-callout-background); + background-image: var(--image-documentation); + border-radius: 50%; + } + } + + .generated-docs { } } } diff --git a/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift b/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift index e71865de9..f302c4471 100644 --- a/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift +++ b/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift @@ -168,7 +168,7 @@ extension BuildIndex.Model { } func cell(text: String) -> Node { - return .div( + .div( .span( .text(text) ) @@ -181,7 +181,13 @@ extension BuildIndex.Model { .a( .href(linkURL), .text(text) - ) + ), + .unwrap(generatedDocs, { generatedDocs in + .if(generatedDocs, .span( + .class("generated-docs"), + .title("If successful, this build generated package documentation.") + )) + }) ) } From 75ac461f48234374b45a38ba5b089cf1fd2353de Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Tue, 1 Nov 2022 16:34:54 +0000 Subject: [PATCH 3/7] Fixed up the matrix item snapshot test. --- Tests/AppTests/BuildIndexModelTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/AppTests/BuildIndexModelTests.swift b/Tests/AppTests/BuildIndexModelTests.swift index 3114a5ead..c18bd10ec 100644 --- a/Tests/AppTests/BuildIndexModelTests.swift +++ b/Tests/AppTests/BuildIndexModelTests.swift @@ -173,7 +173,7 @@ class BuildIndexModelTests: AppTestCase {
Build Succeeded
""") XCTAssertEqual(BuildCell("1.2.3", .release, id, .ok, generatedDocs: true).node.render(), """ -
Build Succeeded
+
Build Succeeded
""") XCTAssertEqual(BuildCell("1.2.3", .release, id, .failed, generatedDocs: false).node.render(), """
Build Failed
From 9ac03dcda69f20daf89321fd4baf7a15cfdb120d Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Tue, 1 Nov 2022 16:36:10 +0000 Subject: [PATCH 4/7] Added a new test that exercises the `generatedDocs` flag. --- Tests/AppTests/BuildIndexModelTests.swift | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Tests/AppTests/BuildIndexModelTests.swift b/Tests/AppTests/BuildIndexModelTests.swift index c18bd10ec..276d6cfb2 100644 --- a/Tests/AppTests/BuildIndexModelTests.swift +++ b/Tests/AppTests/BuildIndexModelTests.swift @@ -216,6 +216,42 @@ class BuildIndexModelTests: AppTestCase { XCTAssertEqual(node.render(), expectation.render()) } + func test_BuildItem_generatedDocs() throws { + // setup + let id = UUID() + let bi = BuildItem(index: .init(swiftVersion: .v5_7, platform: .ios), + values: [ .init("main", .defaultBranch, id, .ok, generatedDocs: true) ]) + + // MUT + let node = bi.node + + let expectation: Node = .li( + .class("row"), + .div( + .class("row-labels"), + .strong("iOS") + ), + .div( + .class("column-labels"), + .div(.span(.class("branch"), .text("main"))) + ), + .div( + .class("results"), + .div( + .class("succeeded"), + .a( + .href("/builds/\(id.uuidString)"), + .text("Build Succeeded") + ), + .span( + .class("generated-docs"), + .title("If successful, this build generated package documentation.") + ) + ) + ) + ) + XCTAssertEqual(node.render(), expectation.render()) + } } From f173c0d766b4a02553461829ac5cae1aeb4e0c54 Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Tue, 1 Nov 2022 16:36:28 +0000 Subject: [PATCH 5/7] Unused CSS class. --- FrontEnd/styles/matrix.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/FrontEnd/styles/matrix.scss b/FrontEnd/styles/matrix.scss index 425ccd22b..e73f58daa 100644 --- a/FrontEnd/styles/matrix.scss +++ b/FrontEnd/styles/matrix.scss @@ -191,8 +191,5 @@ border-radius: 50%; } } - - .generated-docs { - } } } From 5e289a8d99ec87cfdf5dffbf5ea7db69b503c42b Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Tue, 1 Nov 2022 16:53:06 +0000 Subject: [PATCH 6/7] Moved `generatedDocs` one level up so it can be part of the web page snapshot. --- .../Builds/BuildIndex+Model.swift | 12 +- Tests/AppTests/BuildIndexModelTests.swift | 20 ++-- Tests/AppTests/Mocks/BuildIndex+mock.swift | 106 +++++++++--------- 3 files changed, 71 insertions(+), 67 deletions(-) diff --git a/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift b/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift index f302c4471..42a05c27f 100644 --- a/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift +++ b/Sources/App/Views/PackageController/Builds/BuildIndex+Model.swift @@ -59,7 +59,9 @@ private extension Array where Element == PackageController.BuildsRoute.BuildInfo BuildIndex.Model.BuildInfo.init(id: $0.buildId, swiftVersion: $0.swiftVersion, platform: $0.platform, - status: $0.status) + status: $0.status, + // TODO: Replace `generatedDocs: false` as part of #1888. + generatedDocs: false) } return .init(name: name, kind: kind, builds: buildInfo) } @@ -87,17 +89,20 @@ extension BuildIndex.Model { var platform: App.Build.Platform var status: App.Build.Status var swiftVersion: App.SwiftVersion + var generatedDocs: Bool var isCompleted: Bool { status.isCompleted } init(id: App.Build.Id, swiftVersion: App.SwiftVersion, platform: App.Build.Platform, - status: App.Build.Status) { + status: App.Build.Status, + generatedDocs: Bool) { self.id = id self.platform = platform self.status = status self.swiftVersion = swiftVersion + self.generatedDocs = generatedDocs } } } @@ -118,8 +123,7 @@ extension BuildIndex.Model { var column = [RowIndex: BuildCell]() for build in group.builds { guard let index = RowIndex(build) else { continue } - // TODO: Replace `generatedDocs: false` as part of #1888. - column[index] = .init(group.name, group.kind, build.id, build.status, generatedDocs: false) + column[index] = .init(group.name, group.kind, build.id, build.status, generatedDocs: build.generatedDocs) } RowIndex.all.forEach { values[$0, default: []] diff --git a/Tests/AppTests/BuildIndexModelTests.swift b/Tests/AppTests/BuildIndexModelTests.swift index 276d6cfb2..5fb9af814 100644 --- a/Tests/AppTests/BuildIndexModelTests.swift +++ b/Tests/AppTests/BuildIndexModelTests.swift @@ -70,13 +70,13 @@ class BuildIndexModelTests: AppTestCase { // setup let id = UUID() let stable: [BuildInfo] = [ - .init(id: id, swiftVersion: .init(5, 6, 0), platform: .ios, status: .ok), - .init(id: id, swiftVersion: .init(5, 5, 0), platform: .macosXcodebuild, status: .ok), - .init(id: id, swiftVersion: .init(5, 4, 0), platform: .tvos, status: .ok), + .init(id: id, swiftVersion: .init(5, 6, 0), platform: .ios, status: .ok, generatedDocs: true), + .init(id: id, swiftVersion: .init(5, 5, 0), platform: .macosXcodebuild, status: .ok, generatedDocs: false), + .init(id: id, swiftVersion: .init(5, 4, 0), platform: .tvos, status: .ok, generatedDocs: false), ] let latest: [BuildInfo] = [ - .init(id: id, swiftVersion: .init(5, 5, 0), platform: .macosSpm, status: .failed), - .init(id: id, swiftVersion: .init(5, 4, 0), platform: .tvos, status: .ok), + .init(id: id, swiftVersion: .init(5, 5, 0), platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: id, swiftVersion: .init(5, 4, 0), platform: .tvos, status: .ok, generatedDocs: false), ] let model = BuildIndex.Model.init(owner: "foo", ownerName: "Foo", @@ -121,13 +121,13 @@ class BuildIndexModelTests: AppTestCase { // setup let id = UUID() let stable: [BuildInfo] = [ - .init(id: id, swiftVersion: .init(5, 6, 0), platform: .ios, status: .ok), - .init(id: id, swiftVersion: .init(5, 5, 0), platform: .macosXcodebuild, status: .ok), - .init(id: id, swiftVersion: .init(5, 4, 0), platform: .tvos, status: .ok), + .init(id: id, swiftVersion: .init(5, 6, 0), platform: .ios, status: .ok, generatedDocs: false), + .init(id: id, swiftVersion: .init(5, 5, 0), platform: .macosXcodebuild, status: .ok, generatedDocs: false), + .init(id: id, swiftVersion: .init(5, 4, 0), platform: .tvos, status: .ok, generatedDocs: false), ] let latest: [BuildInfo] = [ - .init(id: id, swiftVersion: .init(5, 5, 0), platform: .macosSpm, status: .failed), - .init(id: id, swiftVersion: .init(5, 4, 0), platform: .tvos, status: .ok), + .init(id: id, swiftVersion: .init(5, 5, 0), platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: id, swiftVersion: .init(5, 4, 0), platform: .tvos, status: .ok, generatedDocs: false), ] let model = BuildIndex.Model.init(owner: "foo", ownerName: "Foo", diff --git a/Tests/AppTests/Mocks/BuildIndex+mock.swift b/Tests/AppTests/Mocks/BuildIndex+mock.swift index 38f34caf8..7f21b6781 100644 --- a/Tests/AppTests/Mocks/BuildIndex+mock.swift +++ b/Tests/AppTests/Mocks/BuildIndex+mock.swift @@ -31,79 +31,79 @@ extension BuildIndex.Model { name: "1.2.3", kind: .release, builds: [ - .init(id: Self.id, swiftVersion: .v5_6, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_6, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_6, platform: .macosXcodebuild, status: .triggered), + .init(id: Self.id, swiftVersion: .v5_6, platform: .ios, status: .ok, generatedDocs: true), + .init(id: Self.id, swiftVersion: .v5_6, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), // The Linux build for v5.5 is intentionally missing to test the representation of a pending build // .init(id: Self.id, swiftVersion: .v5_6, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_6, platform: .tvos, status: .timeout), - .init(id: Self.id, swiftVersion: .v5_6, platform: .watchos, status: .infrastructureError), + .init(id: Self.id, swiftVersion: .v5_6, platform: .tvos, status: .timeout, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .watchos, status: .infrastructureError, generatedDocs: false), // - .init(id: Self.id, swiftVersion: .v5_5, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_5, platform: .macosXcodebuild, status: .triggered), - .init(id: Self.id, swiftVersion: .v5_5, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .tvos, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .watchos, status: .ok), + .init(id: Self.id, swiftVersion: .v5_5, platform: .ios, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .linux, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .tvos, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .watchos, status: .ok, generatedDocs: false), // - .init(id: Self.id, swiftVersion: .v5_4, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_4, platform: .macosXcodebuild, status: .triggered), - .init(id: Self.id, swiftVersion: .v5_4, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .tvos, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .watchos, status: .ok), + .init(id: Self.id, swiftVersion: .v5_4, platform: .ios, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .linux, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .tvos, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .watchos, status: .ok, generatedDocs: false), ] ), .init( name: "main", kind: .defaultBranch, builds: [ - .init(id: Self.id, swiftVersion: .v5_6, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_6, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_6, platform: .macosXcodebuild, status: .triggered), - .init(id: Self.id, swiftVersion: .v5_6, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_6, platform: .tvos, status: .ok), - .init(id: Self.id, swiftVersion: .v5_6, platform: .watchos, status: .ok), + .init(id: Self.id, swiftVersion: .v5_6, platform: .ios, status: .ok, generatedDocs: true), + .init(id: Self.id, swiftVersion: .v5_6, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .linux, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .tvos, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .watchos, status: .ok, generatedDocs: false), // - .init(id: Self.id, swiftVersion: .v5_5, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_5, platform: .macosXcodebuild, status: .triggered), - .init(id: Self.id, swiftVersion: .v5_5, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .tvos, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .watchos, status: .ok), + .init(id: Self.id, swiftVersion: .v5_5, platform: .ios, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .linux, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .tvos, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .watchos, status: .ok, generatedDocs: false), // - .init(id: Self.id, swiftVersion: .v5_4, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_4, platform: .macosXcodebuild, status: .triggered), - .init(id: Self.id, swiftVersion: .v5_4, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .tvos, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .watchos, status: .ok), + .init(id: Self.id, swiftVersion: .v5_4, platform: .ios, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .linux, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .tvos, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .watchos, status: .ok, generatedDocs: false), ] ), .init( name: "2.0.0-b1", kind: .preRelease, builds: [ - .init(id: Self.id, swiftVersion: .v5_6, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_6, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_6, platform: .macosXcodebuild, status: .triggered), - .init(id: Self.id, swiftVersion: .v5_6, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_6, platform: .tvos, status: .ok), - .init(id: Self.id, swiftVersion: .v5_6, platform: .watchos, status: .ok), + .init(id: Self.id, swiftVersion: .v5_6, platform: .ios, status: .ok, generatedDocs: true), + .init(id: Self.id, swiftVersion: .v5_6, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .linux, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .tvos, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_6, platform: .watchos, status: .ok, generatedDocs: false), // - .init(id: Self.id, swiftVersion: .v5_5, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_5, platform: .macosXcodebuild, status: .triggered), - .init(id: Self.id, swiftVersion: .v5_5, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .tvos, status: .ok), - .init(id: Self.id, swiftVersion: .v5_5, platform: .watchos, status: .ok), + .init(id: Self.id, swiftVersion: .v5_5, platform: .ios, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .linux, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .tvos, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_5, platform: .watchos, status: .ok, generatedDocs: false), // - .init(id: Self.id, swiftVersion: .v5_4, platform: .ios, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .macosSpm, status: .failed), - .init(id: Self.id, swiftVersion: .v5_4, platform: .macosXcodebuild, status: .triggered), - .init(id: Self.id, swiftVersion: .v5_4, platform: .linux, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .tvos, status: .ok), - .init(id: Self.id, swiftVersion: .v5_4, platform: .watchos, status: .ok), + .init(id: Self.id, swiftVersion: .v5_4, platform: .ios, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .macosSpm, status: .failed, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .macosXcodebuild, status: .triggered, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .linux, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .tvos, status: .ok, generatedDocs: false), + .init(id: Self.id, swiftVersion: .v5_4, platform: .watchos, status: .ok, generatedDocs: false), ] ) ] From 98984dfc5968ae26da2043081050da705fea17c0 Mon Sep 17 00:00:00 2001 From: Dave Verwer Date: Tue, 1 Nov 2022 16:53:10 +0000 Subject: [PATCH 7/7] Snapshots. --- .../__Snapshots__/WebpageSnapshotTests/test_BuildIndex.1.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_BuildIndex.1.html b/Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_BuildIndex.1.html index 7fe0421a2..e1aea3023 100644 --- a/Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_BuildIndex.1.html +++ b/Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_BuildIndex.1.html @@ -294,12 +294,15 @@

Swift 5.6

Build Succeeded +
Build Succeeded +
Build Succeeded +