Skip to content

[Explicit Module Builds] De-duplicate dependency build jobs before adding them to LLBuild manifest #3769

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
Oct 3, 2021

Conversation

artemcm
Copy link
Contributor

@artemcm artemcm commented Sep 29, 2021

This avoids adding duplicate entries to the LLBuild manifest in explicit module builds by de-duplicating explicit dependency pre-build jobs based on their unique output filename.

@artemcm
Copy link
Contributor Author

artemcm commented Sep 29, 2021

testExplicitSwiftPackageBuild is passing with this change, but it is currently skipped due to rdar://82053045.
I'm looking into what it'll take to re-enable it.

@tomerd
Copy link
Contributor

tomerd commented Sep 30, 2021

sry @artemcm I just renamed this file, please rebase

…ing them to LLBuild manifest

This avoids adding duplicate entries to the LLBuild manifest in explicit module builds by de-duplicating explicit dependency pre-build jobs based on their unique output filename.
@artemcm artemcm force-pushed the DedupeExplicitDependencyJobs branch from a4cb171 to 682b1ec Compare September 30, 2021 16:11
@artemcm
Copy link
Contributor Author

artemcm commented Sep 30, 2021

@swift-ci please smoke test

@abertelrud
Copy link
Contributor

Thanks, @artemcm! This should make #3587 pass, I think. I will try a cross-PR build.

@abertelrud
Copy link
Contributor

Verified that #3587 now passes with a cross-PR test with this one. Thanks @artemcm!

@abertelrud
Copy link
Contributor

Merging.

@abertelrud abertelrud merged commit 1d61ceb into swiftlang:main Oct 3, 2021
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