Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pin dependencies to swiftlang GitHub organisation (was apple) and remove .git suffix #105

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Pin dependencies to swiftlang GitHub organisation (was apple) and remove .git suffix #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bf9d39
Point dependnecies to swiftlang git org (not apple) and remove .git s…
liamnichols Jul 16, 2024
2f59725
Donwgrade swift-snapshot-testing when using Beta 2 in workflow
liamnichols Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ jobs:
steps:
- name: Checkout Repo
uses: actions/checkout@v4
- name: Downgrade swift-snapshot-testing
if: matrix.xcode == '16.0'
run: |
# Use 1.17.0 until macOS-14 runner is updated to Xcode 16 Beta 3
# https://github.com/pointfreeco/swift-snapshot-testing/pull/869
if xcodebuild -version | grep 16A5171r; then
jq '(.pins[] | select(.identity == "swift-snapshot-testing") | .state.revision) = "f6c51fa7609b1057ca5420127440413c54971ff6" | (.pins[] | select(.identity == "swift-snapshot-testing") | .state.version) = "1.17.0"' Package.resolved | sed 's/": /" : /g' > Package.resolved.tmp && mv Package.resolved.tmp Package.resolved
fi
- name: Run Tests
run: xcodebuild clean test -scheme XCStringsTool-Package -destination platform=macOS
unit-test-swift-syntax:
Expand Down
10 changes: 5 additions & 5 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
"identity" : "swift-docc-plugin",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-docc-plugin",
"location" : "https://github.com/swiftlang/swift-docc-plugin",
"state" : {
"revision" : "26ac5758409154cc448d7ab82389c520fa8a8247",
"version" : "1.3.0"
Expand All @@ -30,16 +30,16 @@
{
"identity" : "swift-snapshot-testing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
"location" : "https://github.com/pointfreeco/swift-snapshot-testing",
"state" : {
"revision" : "8ddd519780452729c6634ad6bd0d2595938e9ea3",
"version" : "1.16.1"
"revision" : "c097f955b4e724690f0fc8ffb7a6d4b881c9c4e3",
"version" : "1.17.2"
Comment on lines -35 to +36
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes Xcode 16 tests to fail because GitHub Actions don't use Beta 3 yet

We can either wait GitHub, or I can patch the workflow to use an earlier version in the meantime... Will look into it.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It took GitHub 9 days after Beta 2 was released to update. It's been 8 days since Beta 3 was released, so I'll just wait and see this week.

}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "303e5c5c36d6a558407d364878df131c3546fad8",
"version" : "510.0.2"
Expand Down
12 changes: 6 additions & 6 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ let package = Package(
.library(name: "StringCatalog", targets: ["StringCatalog"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.3"),
.package(url: "https://github.com/apple/swift-syntax.git", "509.0.0" ..< "601.0.0"),
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.13.0"),
.package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.3"),
.package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0" ..< "601.0.0"),
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.13.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
],
targets: [
.target(
Expand Down Expand Up @@ -174,8 +174,8 @@ if ProcessInfo.processInfo.environment.keys.contains("BENCHMARK_PACKAGE") {
// Support testing different versions of Swift Syntax
if let revision = ProcessInfo.processInfo.environment["SWIFT_SYNTAX_REVISION"] {
// TODO: The `kind` symbol isn't available in Xcode 15.2? Check newer versions.
package.dependencies.removeAll(where: { $0.url == "https://github.com/apple/swift-syntax.git" })
package.dependencies.removeAll(where: { $0.url == "https://github.com/swiftlang/swift-syntax" })
package.dependencies.append(
.package(url: "https://github.com/apple/swift-syntax.git", revision: revision)
.package(url: "https://github.com/swiftlang/swift-syntax", revision: revision)
)
}