Fix GoogleUtilities zip file structure #12418
Merged
Conversation
This file contains 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
Generated by 🚫 Danger |
andrewheard
approved these changes
Feb 23, 2024
This reverts commit 0cceff0.
This was referenced Feb 23, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fix #12385
This PR fixes the Resource organization issue in GoogleUtilities in the zip that's been causing the nightly zip build failures for the last week.
The issue isn't reproducible in Xcode 15 on macos 13. I suspect the root cause may have to do with file system repercussions of building GoogleUtilities a second time separately for Carthage.
I'll do a bit more investigation, but this should be ready for review, so we can unblock progress on #12407
Getting:
Should be: