Skip to content

Conversation

bripeticca
Copy link
Contributor

The culprit here is the fact that we were essentially doing an AND boolean check across all the traits in the target dependency condition, when we should be doing an OR boolean check.

If at least one trait is enabled in the list of traits in the target dependency condition, then the target dependecy should be considered enabled as well.

The culprit here is the fact that we were essentially doing an
AND boolean check across all the traits in the target dependency
condition, when we should be doing an OR boolean check.

If at least one trait is enabled in the list of traits in
the target dependency condition, then the target dependecy
should be considered enabled as well.
@bripeticca
Copy link
Contributor Author

@swift-ci please test

Copy link
Member

@FranzBusch FranzBusch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch! Can we add to our trait fixtures this setup as well where a single dependency is guarded by two traits?

@bripeticca
Copy link
Contributor Author

@swift-ci please test

@bripeticca
Copy link
Contributor Author

@swift-ci please test windows

Copy link
Contributor

@bkhouri bkhouri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments for your consideration.

* Added a wrapper struct that contains a list of traits that could be passed
  as an argument + the expected output for said combination for TraitTests
* Added extra test cases to traits-related Manifest tests, accounting for
  target dependencies that are enabled by many traits
@bripeticca
Copy link
Contributor Author

@swift-ci please test

@bripeticca
Copy link
Contributor Author

@swift-ci please test

@bripeticca
Copy link
Contributor Author

@swift-ci please test windows

@bripeticca
Copy link
Contributor Author

@swift-ci please test self hosted windows

@bripeticca bripeticca enabled auto-merge (squash) August 26, 2025 18:28
@bripeticca bripeticca merged commit abd3157 into swiftlang:main Aug 26, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants