Drop unknown platforms when generating PIF #9021
Open
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
owenv
requested review from
jakepetroules,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
|
@swift-ci test |
| @@ -962,7 +964,11 @@ extension ProjectModel.BuildSettings.MultipleValueSetting { | |||
| } | |||
|
|
|||
| extension ProjectModel.BuildSettings.Platform { | |||
| init(from platform: PackageModel.Platform) { | |||
| enum Error: Swift.Error { | |||
| case unexpectedPlatform(String) | |||
There was a problem hiding this comment.
nit: it's really "unknown" not "unexpected"
| @@ -584,11 +586,16 @@ public final class PackagePIFBuilder { | |||
| let arm64ePlatforms: [PackageModel.Platform] = [.iOS, .macOS, .visionOS] | |||
| for arm64ePlatform in arm64ePlatforms { | |||
| if self.delegate.shouldPackagesBuildForARM64e(platform: arm64ePlatform) { | |||
| let pifPlatform: ProjectModel.BuildSettings.Platform = switch arm64ePlatform { | |||
| let pifPlatform: ProjectModel.BuildSettings.Platform | |||
| switch arm64ePlatform { | |||
| case .iOS: | |||
There was a problem hiding this comment.
You can just drop this iOS-specific branch. Here it's trying to exclude the simulator platform, but in swiftlang/swift-build#538 I fixed it to completely ignore arm64e for simulator platforms since that arch doesn't exist there, so the workaround is no longer necessary.
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.
Some existing packages use
.when(platforms: [.custom("DoesNotExist")])to unconditionally deactivate settings. Stop asserting on these unknown platforms