[6.2] Make sure we don't get backslashes in the Prebuilts Manifest #9127
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ng#9112) We are running into cases where, if the Windows prebuilts build runs last, it's the one producing the prebuilts manifest. Since we're using RelativePath to for the library include paths, it's resulting in Windows paths being used and that fails on the other platforms. This change makes sure we always use forward slashes which will work on all platforms. Note to do this we're copying over the manifest types to the BuildPrebuilts script temporarily to so we don't need to make changes in 6.2.0. We'll revisit this for the next release where we probably should use per platform JSON files.
dschaefer2
changed the title
|
@swift-ci please test |
bnbarham
approved these changes
Sep 11, 2025
|
@swift-ci please test windows |
dschaefer2
added a commit
that referenced
this pull request
Sep 14, 2025
Cherry pick of #8994 and #9127 to 6.2.1 8994 added the ability to build prebuilts and pass in the swift-syntax versions to build for. This was added to 6.2 after the 6.2.1 branch was created. We should make sure 6.2.1 has the same features in case we want to build the prebuilts from that branch. It also avoids a merge conflict with 9127. 9127 Fixes a bug where if Windows prebuilts built last, the include path to the C shims had backslashes in them instead of slashes. This forces them the other way. That unfortunately breaks the signature on the Windows client so this fixes the client to switch them back after signature verification.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry pick of #9112 from main.
We are running into cases where, if the Windows prebuilts build runs last, it's the one producing the prebuilts manifest. Since we're using RelativePath to for the library include paths, it's resulting in Windows paths being used and that fails on the other platforms. This change makes sure we always use forward slashes which will work on all platforms. We use strings for the manifest and correct the slashes before writing them in the generator. We then convert them back to RelativePaths on the client side.