Skip to content

Commit bd2bd95

Browse files
finestructurefinestructure
authored
Merge pull request #66 from SwiftPackageIndex/swift-6
Use Swift 6 nightly for validation
2 parents d56a0fe + d08bc45 commit bd2bd95

File tree

3 files changed

+108
-8
lines changed

3 files changed

+108
-8
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
swift-test-Linux:
2828
runs-on: ubuntu-latest
2929
container:
30-
image: swift:5.10-jammy
30+
image: swiftlang/swift@sha256:30154112a700a5a95fd1760716bd2040e8b735f54f081a4865823abdec67d17e # swiftlang/swift:nightly-6.0-jammy as of May 26
3131
steps:
3232
- name: Get swift version
3333
run: swift --version
@@ -41,7 +41,7 @@ jobs:
4141
end-to-end-test-Linux:
4242
runs-on: ubuntu-latest
4343
container:
44-
image: swift:5.10-jammy
44+
image: swiftlang/swift@sha256:30154112a700a5a95fd1760716bd2040e8b735f54f081a4865823abdec67d17e # swiftlang/swift:nightly-6.0-jammy as of May 26
4545
steps:
4646
- name: Get swift version
4747
run: swift --version

‎Tests/ValidatorTests/Fixtures/github-files-response-multiple-manifests.json

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
{
2+
"tree" : [
3+
{
4+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/024f01f8183865bd26e15a7828b0d3a33028d5c5",
5+
"path" : ".gitignore",
6+
"sha" : "024f01f8183865bd26e15a7828b0d3a33028d5c5",
7+
"size" : 290,
8+
"type" : "blob",
9+
"mode" : "100644"
10+
},
11+
{
12+
"path" : ".swift-version",
13+
"type" : "blob",
14+
"mode" : "100644",
15+
"sha" : "6b244dcd6960b101b0ab4d9e5162d39632dec80c",
16+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/6b244dcd6960b101b0ab4d9e5162d39632dec80c",
17+
"size" : 6
18+
},
19+
{
20+
"type" : "blob",
21+
"path" : ".travis.yml",
22+
"mode" : "100644",
23+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/70e2b4cdfc5b7e26d7f55d97833f96aeb7d5c481",
24+
"size" : 1697,
25+
"sha" : "70e2b4cdfc5b7e26d7f55d97833f96aeb7d5c481"
26+
},
27+
{
28+
"sha" : "a7af196875ec68b64f30963189392f71ab9ecf79",
29+
"type" : "blob",
30+
"mode" : "100644",
31+
"size" : 1075,
32+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/a7af196875ec68b64f30963189392f71ab9ecf79",
33+
"path" : "LICENSE"
34+
},
35+
{
36+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/e0570d6a1e3f5b1b4bd213315d8f0966ca8f675f",
37+
"path" : "Package.pins",
38+
"mode" : "100644",
39+
"type" : "blob",
40+
"size" : 53,
41+
"sha" : "e0570d6a1e3f5b1b4bd213315d8f0966ca8f675f"
42+
},
43+
{
44+
"path" : "Package.swift",
45+
"mode" : "100644",
46+
"size" : 825,
47+
"type" : "blob",
48+
"sha" : "63080bd3c929a37b0c8d0796b5d08e51794c18c2",
49+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/63080bd3c929a37b0c8d0796b5d08e51794c18c2"
50+
},
51+
{
52+
"type" : "blob",
53+
"path" : "[email protected]",
54+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/7bd26320357525801b4607dcf78bfeab4ece8508",
55+
"sha" : "7bd26320357525801b4607dcf78bfeab4ece8508",
56+
"size" : 1517,
57+
"mode" : "100644"
58+
},
59+
{
60+
"path" : "[email protected]",
61+
"type" : "blob",
62+
"sha" : "17d053009476faba4f7832d8fb0f408d6cf94ffa",
63+
"mode" : "100644",
64+
"size" : 1517,
65+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/17d053009476faba4f7832d8fb0f408d6cf94ffa"
66+
},
67+
{
68+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/b263042f912ec32a770d2ba254bb6a8c2a49122a",
69+
"path" : "[email protected]",
70+
"size" : 1517,
71+
"type" : "blob",
72+
"mode" : "100644",
73+
"sha" : "b263042f912ec32a770d2ba254bb6a8c2a49122a"
74+
},
75+
{
76+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/blobs\/4003b2930a1f8488067c543810d02e6fa2c7c949",
77+
"type" : "blob",
78+
"size" : 8861,
79+
"mode" : "100644",
80+
"path" : "README.md",
81+
"sha" : "4003b2930a1f8488067c543810d02e6fa2c7c949"
82+
},
83+
{
84+
"mode" : "040000",
85+
"sha" : "4134f985c3bf0d4fc7029a127fa5082f2a7755a3",
86+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/trees\/4134f985c3bf0d4fc7029a127fa5082f2a7755a3",
87+
"type" : "tree",
88+
"path" : "Sources"
89+
},
90+
{
91+
"type" : "tree",
92+
"sha" : "02fff52637912ccbcbbbbf2aa469de994c8b3441",
93+
"path" : "Tests",
94+
"mode" : "040000",
95+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/trees\/02fff52637912ccbcbbbbf2aa469de994c8b3441"
96+
}
97+
],
98+
"sha" : "f9b4754017cfad4701f0838b2e507b442eaca70a",
99+
"url" : "https:\/\/api.github.com\/repos\/IBM-Swift\/SwiftyJSON\/git\/trees\/f9b4754017cfad4701f0838b2e507b442eaca70a",
100+
"truncated" : false
101+
}

‎Tests/ValidatorTests/PackageTests.swift

+5-6
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ final class PackageTests: XCTestCase {
2525

2626
func test_decode_multiple_manifests() async throws {
2727
// This tests package dump for a package with four versioned package manifest files.
28-
// We use a captured response for the SwiftyJSON package which lists four manifest files
29-
// and then save no data for three of them that shouldn't be used and mock in the
30-
// SemanticVersion manifest files for the one that should be decoded.
28+
// We use a captured response for a package which lists four manifest files.
29+
// For three of them that shouldn't be used we send no data when they are fetched.
30+
// We mock in the SemanticVersion manifest file for the one that should be decoded.
3131
// setup
3232
Current = .mock
3333
Current.fileManager = .live
3434
var manifestsFetched = 0
3535
Current.fetch = { client, url in
3636
switch url.absoluteString {
37-
case "https://raw.githubusercontent.com/org/1/main/Package@swift-5.swift":
37+
case "https://raw.githubusercontent.com/org/1/main/Package@swift-6.swift":
3838
// Package.decode -> fetch manifestURL data
3939
manifestsFetched += 1
4040
return client.eventLoopGroup.next().makeSucceededFuture(
@@ -51,8 +51,7 @@ final class PackageTests: XCTestCase {
5151
case "https://api.github.com/repos/org/1/git/trees/main":
5252
// getManifestURLs -> Github.listRepositoryFilePaths -> Github.fetch
5353
return client.eventLoopGroup.next().makeSucceededFuture(
54-
// github-files-response-SwiftyJSON has multiple manifest files
55-
try! .fixture(for: "github-files-response-SwiftyJSON.json")
54+
try! .fixture(for: "github-files-response-multiple-manifests.json")
5655
)
5756
default:
5857
return client.eventLoopGroup.next().makeFailedFuture(

0 commit comments

Comments
 (0)