6.0 [windows] path: drop the trailing backslash before invoking PathCchRe…#480
Merged
Merged
Conversation
Contributor
Author
|
@swift-ci please test |
compnerd
approved these changes
Aug 5, 2024
MaxDesiatov
changed the title
Contributor
|
@swift-ci test windows |
bnbarham
approved these changes
Aug 5, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
…… (#479)
(cherry picked from commit a76104d)
Explanation: After new swift-foundation was adopted on windows, swiftpm failed to build a project when your SDKROOT environment variable had a trailing '\' on windows. This was due to Info.plist not being found that was needed for the XCTest include paths. This was because
dirnameon a windows path now returned the original path without going up a level if the path had a trailing '\' asPathCchRemoveFileSpecdoesn't remove the dirname in that case. This regression was addressed by dropping the trailing '' before callingPathCchRemoveFileSpec.Scope: windows path handling, tools like SwiftPM that use TSC.
Risk: Low, only impacts paths that have a trailing '\'.
Testing: Unit tests, manual testing of SwiftPM locally and in a github workflow
Reviewer: @compnerd
Main branch PR: #479