Skip to content

Commit 480bcc5

Browse files
finestructurefinestructure
committed
Adpot SPIManifest changes
1 parent 71bd6b1 commit 480bcc5

30 files changed

+257
-228
lines changed

‎Sources/App/Core/SwiftVersion+Build.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ extension SwiftVersion {
1818
// https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/1267#issuecomment-975379966
1919
// Patch versions are irrelevant here but the underlying type requires one, so use 0
2020
// in general.
21-
static let v5_8: Self = .init(5, 8, 0)
2221
static let v5_9: Self = .init(5, 9, 0)
2322
static let v5_10: Self = .init(5, 10, 0)
2423
static let v6_0: Self = .init(6, 0, 0)
24+
static let v6_1: Self = .init(6, 1, 0)
2525

2626
/// Currently supported swift versions for building
2727
static var allActive: [Self] {
28-
[.v5_8, .v5_9, .v5_10, .v6_0]
28+
[.v5_9, .v5_10, .v6_0, .v6_1]
2929
}
3030

3131
var xcodeVersion: String? {
3232
// NB: this is used for display purposes and not critical for compiler selection
3333
switch self {
34-
case .v5_8:
35-
return "Xcode 14.3"
3634
case .v5_9:
3735
return "Xcode 15.2"
3836
case .v5_10:
3937
return "Xcode 15.4"
4038
case .v6_0:
4139
return "Xcode 16.2"
40+
case .v6_1:
41+
return "Xcode 16.3"
4242
default:
4343
return nil
4444
}

‎Tests/AppTests/API+PackageController+GetRoute+ModelTests.swift

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -484,25 +484,25 @@ extension AllTests.API_PackageController_GetRoute_ModelTests {
484484

485485
do {
486486
let info = BuildInfo(stable: .some(.init(referenceName: "1.2.3",
487-
results: Results(results: [.v5_8: .compatible,
488-
.v5_9: .incompatible,
489-
.v5_10: .unknown,
490-
.v6_0: .compatible]))),
487+
results: Results(results: [.v1: .compatible,
488+
.v2: .incompatible,
489+
.v3: .unknown,
490+
.v4: .compatible]))),
491491
beta: nil,
492492
latest: nil)
493493
#expect(info?.compatibility == [.v1, .v4])
494494
}
495495
do {
496496
let info = BuildInfo(stable: .some(.init(referenceName: "1.2.3",
497-
results: Results(results: [.v5_8: .compatible,
498-
.v5_9: .incompatible,
499-
.v5_10: .unknown,
500-
.v6_0: .compatible]))),
497+
results: Results(results: [.v1: .compatible,
498+
.v2: .incompatible,
499+
.v3: .unknown,
500+
.v4: .compatible]))),
501501
beta: .some(.init(referenceName: "1.2.3-b1",
502-
results: Results(results: [.v5_8: .incompatible,
503-
.v5_9: .incompatible,
504-
.v5_10: .compatible,
505-
.v6_0: .unknown]))),
502+
results: Results(results: [.v1: .incompatible,
503+
.v2: .incompatible,
504+
.v3: .compatible,
505+
.v4: .unknown]))),
506506
latest: nil)
507507
#expect(info?.compatibility == [.v1, .v3, .v4])
508508
}
@@ -545,18 +545,18 @@ extension AllTests.API_PackageController_GetRoute_ModelTests {
545545

546546
@Test func groupBuildInfo() async throws {
547547
try await withSPIApp { app in
548-
let result1: BuildResults = .init(results: [.v5_8: .compatible,
549-
.v5_9: .compatible,
550-
.v5_10: .compatible,
551-
.v6_0: .compatible])
552-
let result2: BuildResults = .init(results: [.v5_8: .compatible,
553-
.v5_9: .incompatible,
554-
.v5_10: .incompatible,
555-
.v6_0: .incompatible])
556-
let result3: BuildResults = .init(results: [.v5_8: .unknown,
557-
.v5_9: .unknown,
558-
.v5_10: .unknown,
559-
.v6_0: .unknown])
548+
let result1: BuildResults = .init(results: [.v1: .compatible,
549+
.v2: .compatible,
550+
.v3: .compatible,
551+
.v4: .compatible])
552+
let result2: BuildResults = .init(results: [.v1: .compatible,
553+
.v2: .incompatible,
554+
.v3: .incompatible,
555+
.v4: .incompatible])
556+
let result3: BuildResults = .init(results: [.v1: .unknown,
557+
.v2: .unknown,
558+
.v3: .unknown,
559+
.v4: .unknown])
560560
do { // three distinct groups
561561
let buildInfo: BuildInfo = .init(stable: .init(referenceName: "1.2.3", results: result1),
562562
beta: .init(referenceName: "2.0.0-b1", results: result2),

‎Tests/AppTests/API+PackageControllerTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,9 @@ extension AllTests.API_PackageControllerTests {
343343
#expect(platform.beta?.referenceName == "2.0.0-b1")
344344
let swiftVersion = try #require(res.swiftVersion)
345345
#expect(swiftVersion.latest?.referenceName == "main")
346-
#expect(swiftVersion.latest?.results[.v5_10] == .compatible)
347-
#expect(swiftVersion.latest?.results[.v5_9] == .incompatible)
348-
#expect(swiftVersion.latest?.results[.v5_8] == .unknown)
346+
#expect(swiftVersion.latest?.results[.v3] == .compatible)
347+
#expect(swiftVersion.latest?.results[.v2] == .incompatible)
348+
#expect(swiftVersion.latest?.results[.v1] == .unknown)
349349
#expect(swiftVersion.stable?.referenceName == "1.2.3")
350350
#expect(swiftVersion.beta?.referenceName == "2.0.0-b1")
351351
}

‎Tests/AppTests/AlertingTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ extension AllTests.AlertingTests {
3434
Alerting.BuildInfo.mock(swiftVersion: $0)
3535
}
3636
#expect(all.validateSwiftVersionsPresent() == .ok)
37-
#expect(all.filter { $0.swiftVersion != .v1 }.validateSwiftVersionsPresent() == .failed(reasons: ["Missing Swift version: 5.8"]))
38-
#expect(all.filter { $0.swiftVersion != .v1 && $0.swiftVersion != .v2 }.validateSwiftVersionsPresent() == .failed(reasons: ["Missing Swift version: 5.8", "Missing Swift version: 5.9"]))
37+
#expect(all.filter { $0.swiftVersion != .v1 }.validateSwiftVersionsPresent() == .failed(reasons: ["Missing Swift version: 5.9"]))
38+
#expect(all.filter { $0.swiftVersion != .v1 && $0.swiftVersion != .v2 }.validateSwiftVersionsPresent() == .failed(reasons: ["Missing Swift version: 5.9", "Missing Swift version: 5.10"]))
3939
}
4040

4141
@Test func validatePlatformsSuccessful() throws {
@@ -57,13 +57,13 @@ extension AllTests.AlertingTests {
5757
Alerting.BuildInfo.mock(swiftVersion: $0, status: .ok)
5858
}
5959
#expect(all.validateSwiftVersionsSuccessful() == .ok)
60-
#expect(all.filter { $0.swiftVersion != .v1 }.validateSwiftVersionsSuccessful() == .failed(reasons: ["Swift version without successful builds: 5.8"]))
60+
#expect(all.filter { $0.swiftVersion != .v1 }.validateSwiftVersionsSuccessful() == .failed(reasons: ["Swift version without successful builds: 5.9"]))
6161
#expect(
6262
Array(all.filter { $0.swiftVersion != .v1 })
6363
.appending(.mock(swiftVersion: .v1, status: .failed))
64-
.validateSwiftVersionsSuccessful() == .failed(reasons: ["Swift version without successful builds: 5.8"])
64+
.validateSwiftVersionsSuccessful() == .failed(reasons: ["Swift version without successful builds: 5.9"])
6565
)
66-
#expect(all.filter { $0.swiftVersion != .v1 && $0.swiftVersion != .v2 }.validateSwiftVersionsSuccessful() == .failed(reasons: ["Swift version without successful builds: 5.8", "Swift version without successful builds: 5.9"]))
66+
#expect(all.filter { $0.swiftVersion != .v1 && $0.swiftVersion != .v2 }.validateSwiftVersionsSuccessful() == .failed(reasons: ["Swift version without successful builds: 5.9", "Swift version without successful builds: 5.10"]))
6767
}
6868

6969
@Test func validateRunnerIdsPresent() throws {

‎Tests/AppTests/ApiTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ extension AllTests.ApiTests {
817817
let badge = try res.content.decode(Badge.self)
818818
#expect(badge.schemaVersion == 1)
819819
#expect(badge.label == "Swift")
820-
#expect(badge.message == "5.9 | 5.8")
820+
#expect(badge.message == "5.10 | 5.9")
821821
#expect(badge.isError == false)
822822
#expect(badge.color == "blue")
823823
#expect(badge.cacheSeconds == 6*3600)

‎Tests/AppTests/BadgeTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Testing
2020
extension AllTests.BadgeTests {
2121

2222
@Test func badgeMessage_swiftVersions() throws {
23-
#expect(Badge.badgeMessage(swiftVersions: [.v1, .v2, .v3, .v4]) == "6.0 | 5.10 | 5.9 | 5.8")
23+
#expect(Badge.badgeMessage(swiftVersions: [.v1, .v2, .v3, .v4]) == "6.1 | 6.0 | 5.10 | 5.9")
2424
#expect(Badge.badgeMessage(swiftVersions: []) == nil)
2525
}
2626

‎Tests/AppTests/BuildIndexModelTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ extension AllTests.BuildIndexModelTests {
9696
let matrix = model.buildMatrix
9797

9898
// validate
99-
#expect(matrix.values.keys.count == 27)
99+
#expect(matrix.values.keys.count == 28)
100100
#expect(
101101
matrix.values[.init(swiftVersion: .v3, platform: .iOS)]?.map(\.column.label) == ["1.2.3", "2.0.0-b1", "main"]
102102
)
@@ -141,7 +141,7 @@ extension AllTests.BuildIndexModelTests {
141141
let matrix = model.buildMatrix
142142

143143
// validate
144-
#expect(matrix.values.keys.count == 27)
144+
#expect(matrix.values.keys.count == 28)
145145
#expect(
146146
matrix.values[.init(swiftVersion: .v3, platform: .iOS)]?.map(\.column.label) == ["1.2.3", "main"]
147147
)

0 commit comments

Comments
 (0)