Skip to content

Update diagnostics for duplicated product/target names #7572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2024

Conversation

neonichu
Copy link
Contributor

rdar://127623219

@@ -13015,17 +13015,9 @@ final class WorkspaceTests: XCTestCase {
do {
workspace.sourceControlToRegistryDependencyTransformation = .disabled

XCTAssertThrowsError(try workspace.checkPackageGraph(roots: ["root"]) { _, diagnostics in
testDiagnostics(diagnostics) { result in
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was unreachable.

@@ -13135,31 +13127,16 @@ final class WorkspaceTests: XCTestCase {

do {
workspace.sourceControlToRegistryDependencyTransformation = .disabled
if ToolsVersion.current < .v5_8 {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was obviously always false.

@neonichu
Copy link
Contributor Author

@swift-ci please test

Copy link
Contributor

@xedin xedin left a comment

Choose a reason for hiding this comment

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

Thank you!

@xedin xedin merged commit e5123e4 into main May 17, 2024
5 checks passed
@xedin xedin deleted the update-duplicated-targets-and-products-diagnostics branch May 17, 2024 05:31
@xedin
Copy link
Contributor

xedin commented May 17, 2024

@neonichu could you please cherry-pick this to 6.0 branch as well?

@neonichu
Copy link
Contributor Author

Sure #7575

xedin pushed a commit that referenced this pull request May 18, 2024
- Explanation:

Improves diagnostic messages for duplicate product/target to include
involved packages and other useful information.

- Scope: Package manifests/graphs with duplicate product/target names.

- Main Branch PRs:
#7572

- Resolves: rdar://127623219

- Risk: Very Low

- Reviewed By: @xedin 

- Testing: New tests were added to the suite and existing tests updated.


(cherry picked from commit e5123e4)
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.

2 participants