Skip to content

Commit

Permalink
Merge branch 'main' into add-forked-from-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
supersonicbyte authored Sep 23, 2024
2 parents 6a627d1 + ccfc547 commit ce07502
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 112 deletions.
8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -231,17 +231,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SwiftPackageIndex/SPIManifest.git",
"state" : {
"revision" : "dad0c2f1c386816b4c39c09e75be552ca8d5a798",
"version" : "1.6.0"
"revision" : "7726c6e0b7ac997b0869f37fe864209988707bb5",
"version" : "1.7.0"
}
},
{
"identity" : "sql-kit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/vapor/sql-kit.git",
"state" : {
"revision" : "f697d3289c628acd241e3b2c7d3ff068adcc52d1",
"version" : "3.31.1"
"revision" : "e0b35ff07601465dd9f3af19a1c23083acaae3bd",
"version" : "3.32.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Tests/AppTests/BuildTriggerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ class BuildTriggerTests: AppTestCase {
configs:
- documentation_targets: [t0]
""")
XCTAssertEqual(manifest.docPairs, [.init(.macosSpm, .v5_10)])
XCTAssertEqual(manifest.docPairs, [.init(.macosSpm, .v6_0)])
}
do {
let manifest = try SPIManifest.Manifest(yml: """
Expand Down Expand Up @@ -322,7 +322,7 @@ class BuildTriggerTests: AppTestCase {
let expectedPairs = Set(SwiftVersion.allActive.map { BuildPair(.macosSpm, $0) })
XCTAssertEqual(res, [.init(versionId: versionId,
buildPairs: expectedPairs,
docPairs: .init([.init(.macosSpm, .v5_10)]),
docPairs: .init([.init(.macosSpm, .v6_0)]),
reference: .tag(1, 2, 3))!])
}

Expand Down
Loading

0 comments on commit ce07502

Please sign in to comment.