🍒 Cherry pick utils: avoid redirection and use pipes for output redirection #82847
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
When the output is directly redirected, the output is re-encoded. This is particularly important as `Write-PList` uses `Invoke-Program` to invoke `python.exe` to write the plist. However, because it is writing to a file, while the output from Python is in UTF-8, the redirection re-encodes the output to UTF16LE (BOM). Adjust the invocation to use PS7+ `2|` and pipe both stdout and stderr as appropriate into files with UTF-8 encoding restoring the encoding for the file.
plemarquand
added
🍒 release cherry pick
compnerd
approved these changes
Jul 7, 2025
|
For more context, this prevents the VS Code Swift Extension from initializing with a nightly 6.2 toolchain build as it expects Windows.platform/Info.plist to be encoded utf8. |
|
@swift-ci please test |
bnbarham
approved these changes
Jul 7, 2025
bkhouri
approved these changes
Jul 7, 2025
There was a problem hiding this comment.
It would have been nice being able to add a test to ensure we don't regress. Would https://github.com/swiftlang/swift-integration-tests be the right place?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Explanation: This fixes the encoding of the written plist files produced during a Windows toolchain build.
Scope: Bug fix for the Windows toolchain
Original PR: #80775
Risk: Low, this simply maintains the encoding on program output during a toolchain build.
Testing: Swift CI
Reviewers: @jeffdav @compnerd
Original commit description:
When the output is directly redirected, the output is re-encoded. This is particularly important as
Write-PListusesInvoke-Programto invokepython.exeto write the plist. However, because it is writing to a file, while the output from Python is in UTF-8, the redirection re-encodes the output to UTF16LE (BOM). Adjust the invocation to use PS7+2|and pipe both stdout and stderr as appropriate into files with UTF-8 encoding restoring the encoding for the file.