Skip to content

Conversation

xedin
Copy link
Contributor

@xedin xedin commented Jul 11, 2025

… building target for both host and destination

  • Explanation:

    This is a limited cherry-pick of Support swift package migrate with --build-system swiftbuild #8888

    For example if a target is a dependency of a plugin we build it for host and destination and produce the same fix-it twice and attempt to update manifest twice because uniquing is done on the ModuleBuildDescriptions.

    The changes do the following:

    • Coalesce all the diagnostic files for the same target regardless of host or destination build to make it possible forSwiftFixIt to filter duplicate fix-its;
    • Unique based on module identity to prevent duplicate setting insertion.
  • Resolves: rdar://155569285

  • Main Branch PR: Support swift package migrate with --build-system swiftbuild #8888

  • Risk: Very Low. This is a narrow fix for swift package migrate command.

  • Reviewed By: Me and @AnthonyLatsis reviewed the work in the main PR.

  • Testing: Added new test-cases to the suite.

… building target for both host and destination

This is a limited cherry-pick of swiftlang#8888

For example if a target is a dependency of a plugin we build it for host and destination and
produce the same fix-it twice and attempt to update manifest twice because uniquing is done
on the ModuleBuildDescriptions.

The changes do the following:

- Coalesce all the diagnostic files for the same target regardless of host or destination
  build to make it possible for `SwiftFixIt` to filter duplicate fix-its;
- Unique based on module identity to prevent duplicate setting insertion.

Resolves: rdar://155569285
@xedin xedin force-pushed the rdar-155569285-6.2 branch from fcdec32 to b93bec7 Compare July 11, 2025 19:33
Copy link
Contributor

@owenv owenv left a comment

Choose a reason for hiding this comment

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

Thanks!

@xedin
Copy link
Contributor Author

xedin commented Jul 11, 2025

@swift-ci please test

@xedin xedin merged commit 8a4b37f into swiftlang:release/6.2 Jul 12, 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.

5 participants