Skip to content

Fix incompatible Package.resolved pins and add CI guard #770

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

Merged
theospears merged 4 commits into from
Apr 26, 2026
Merged

Fix incompatible Package.resolved pins and add CI guard #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be9d7a3
Revert "Bump github.com/swiftlang/swift-syntax from 603.0.0 to 603.0.…
theospears Apr 26, 2026
020e872
Revert "Bump github.com/swiftlang/swift-syntax from 602.0.0 to 603.0.…
theospears Apr 26, 2026
c15efbe
Add CI check for Package.resolved consistency
theospears Apr 26, 2026
cfdd894
Bump keychain-swift minimum version to 24.0.0
theospears Apr 26, 2026
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
7 changes: 7 additions & 0 deletions .github/workflows/fastlane-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ jobs:
run: defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
- name: Run tests
run: bundle exec fastlane ci
- name: Verify Package.resolved is consistent
run: |
if ! git diff --quiet BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved; then
echo "::error::Package.resolved was modified during build. This means the checked-in versions are incompatible with the project's dependency constraints. Diff:"
git diff BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
exit 1
fi
- name: Upload report
uses: actions/upload-artifact@v7
if: always() # always run even if the previous step fails
Expand Down
2 changes: 1 addition & 1 deletion BeeSwift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@
repositoryURL = "https://github.com/evgenyneu/keychain-swift";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 20.0.0;
minimumVersion = 24.0.0;
};
};
E462BA3429AC44EA00E80EF0 /* XCRemoteSwiftPackageReference "Alamofire" */ = {
Expand Down
4 changes: 2 additions & 2 deletions BeeSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading