Use only enabled traits when loading package #8970
Merged
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
Both `loadPackage` and `loadRootPackage` specified all traits as enabled when loading a package. Narrow this to only the enabled traits so that the returned `Package` accurately reflects the enabled traits.
plemarquand
requested review from
jakepetroules,
dschaefer2,
shawnhyam,
bripeticca,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
FranzBusch
approved these changes
Jul 25, 2025
|
@swift-ci test |
bripeticca
approved these changes
Jul 25, 2025
bkhouri
reviewed
Jul 25, 2025
| @@ -1262,8 +1262,7 @@ extension Workspace { | |||
| prebuilts: [:], | |||
| fileSystem: self.fileSystem, | |||
| observabilityScope: observabilityScope, | |||
| // For now we enable all traits | |||
| enabledTraits: Set(manifest.traits.map(\.name)) | |||
| enabledTraits: try manifest.enabledTraits(using: .default) | |||
There was a problem hiding this comment.
suggestion: can we add one or more automated tests to ensure we don't regress the behaviour?
|
@swift-ci please test windows |
1 similar comment
|
@swift-ci please test windows |
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.
Both
loadPackageandloadRootPackagespecified all traits as enabled when loading a package. Narrow this to only the enabled traits so that the returnedPackageaccurately reflects the enabled traits.