Skip to content

Forward cherry pick the prebuilts feature to main. #8610

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 8 commits into from
May 9, 2025

Conversation

dschaefer2
Copy link
Member

To get the prebuilts feature out in time for 6.1, the bulk of the work was done on the release/6.1 branch. Cherry pick those changes to the main branch to get 6.2 caught up.

This is a manual cherry pick so it's going to be a bit hard to follow. I did a diff between main and release/6.1 and copied all the changes I made there.

To get the prebuilts feature out in time for 6.1, the bulk of the
work was done on the release/6.1 branch. Cherry pick those changes
to the main branch to get 6.2 caught up.

This is a manual cherry pick so it's going to be a bit hard to
follow. I did a diff between main and release/6.1 and copied all
the changes I made there.
It' not a dependency in the package manifest.
dschaefer2 added a commit to dschaefer2/swift that referenced this pull request May 9, 2025
Super surprised to see the build for swift test hardcoded in
the build.ps1 script instead of in the sourcekit-lsp repo.
At any rate, looks like I need to add the dependency on ASN1
here too.

This is to support changes in SwiftPM that add the dependency
which translates through to sourcekit-lsp.

swiftlang/swift-package-manager#8610
@dschaefer2
Copy link
Member Author

@swift-ci please test windows

@dschaefer2 dschaefer2 merged commit 8e4dd07 into swiftlang:main May 9, 2025
6 checks passed
@dschaefer2 dschaefer2 deleted the main-prebuilts branch May 9, 2025 23:38
@dschaefer2
Copy link
Member Author

OMG, it finally passed. Now to do this all again for release/6.2...

dschaefer2 added a commit to dschaefer2/swift that referenced this pull request May 12, 2025
Super surprised to see the build for swift test hardcoded in
the build.ps1 script instead of in the sourcekit-lsp repo.
At any rate, looks like I need to add the dependency on ASN1
here too.

This is to support changes in SwiftPM that add the dependency
which translates through to sourcekit-lsp.

swiftlang/swift-package-manager#8610
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.

2 participants