Temporarily revert the 5.5 merge of unifying PackageDescription 4.0 and 4.2+ since it broke Windows #3554
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
…a single library by using availability annotations instead of #if (swiftlang#3492)" This caused the Windows toolchains to break, so this temporarily reverts the change until the installer can be adjusted. This reverts commit d875e4f.
|
Marking Do Not Merge until we know whether a temporary revert will be needed, but starting tests so we will be ready to do so if needed. Alternatively I can rework these changes to parameterize them, but I'd rather not spend more time unless I need to. It would be fine to revert for a few days — I had forgotten about the effect on the Windows toolchain packaging when merging this. |
|
@swift-ci please test |
|
We managed to get the issue sorted out without reverting. I'm going to close off the change as we do not want this to get merged. |
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.
Temporarily revert "[5.5] Unify PackageDescription 4.0 and 4.2+ into a single library by using availability annotations instead of #if (#3492)"
This caused the Windows toolchains to break, so this temporarily reverts the change until the installer can be adjusted.
This will be brought back when the Windows toolchain has been adjusted.
This reverts commit d875e4f.