Skip to content

Update Yams version to fix Android build #1731

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.

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
merged 1 commit into from
Nov 21, 2024
Merged

Update Yams version to fix Android build #1731

merged 1 commit into from
Nov 21, 2024

Conversation

jakepetroules
Copy link
Contributor

No description provided.

@jakepetroules
Copy link
Contributor Author

@swift-ci please smoke test

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

This seems fine, but please cross-check update-check-config.json in the swift repository to ensure that everything is in sync.

@jakepetroules
Copy link
Contributor Author

#1731
swiftlang/swift#77713

@swift-ci please test

@jakepetroules
Copy link
Contributor Author

This seems fine, but please cross-check update-check-config.json in the swift repository to ensure that everything is in sync.

swiftlang/swift#77713

@jakepetroules
Copy link
Contributor Author

#1731
swiftlang/swift#77713

@swift-ci please test

@finagolfin
Copy link
Member

Thanks, I've updated my Android CI and Termux toolchain to use your new swift-toolchain-sqlite package for SwiftPM, will submit that upstream once I test it more. Any plans to switch over sourcekit-lsp and this repo to use it too? It would be good to get rid of that external SQLite dependency altogether.

I also have to keep patching swift-argument-parser and a few other packages because their tags haven't advanced enough to use my upstreamed Android pulls: let me know if we can bump those too.

In particular, swift-argument-parser 1.5.0 has my similar Android overlay patch: these pulls could probably bump the toolchain to use that tag too.

@jakepetroules jakepetroules merged commit bee6273 into main Nov 21, 2024
3 checks passed
@jakepetroules jakepetroules deleted the update-yams branch November 21, 2024 08:46
@jakepetroules
Copy link
Contributor Author

Any plans to switch over sourcekit-lsp and this repo to use it too?

I thought we switched over everything in the Swift project that was using sqlite to use the new package; did I miss something? It doesn't look like sourcekit-lsp directly uses it.

I also have to keep patching swift-argument-parser and a few other packages because their tags haven't advanced enough to use my upstreamed Android pulls: let me know if we can bump those too.

Are you asking for new tags to be created for these repos? I could look at doing so for llbuild and TSC at least.

@finagolfin
Copy link
Member

I thought we switched over everything in the Swift project that was using sqlite to use the new package; did I miss something? It doesn't look like sourcekit-lsp directly uses it.

I simply did a search for which binaries link against the SQLite3 library, did not check exactly how sourcekit-lsp got that pulled in. It's possible that with your recent pulls for Android, it's no longer a dependency there. 😃

Do you plan to switch linux and other ELF platforms like BSD over to using swift-toolchain-sqlite next?

Are you asking for new tags to be created for these repos?

No, I think most have had new tags after my Android overlay changes: the Swift toolchain is simply using the older tags still, so if you want to bump more tags like this in the toolchain, I'm all for it. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants