Fix artifact de-duplication so it selects the artifact with the right exclusions #613
Conversation
This file contains 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
cheister
force-pushed
the
dedup-dependency-with-exclusions
branch
from
a79894c
to
5594d3e
Compare
jin
approved these changes
Oct 27, 2021
| if sorted(duplicate_artifact["exclusions"]) == sorted(artifacts_with_exclusions[duplicate_coord]): | ||
| found_artifact_with_exclusion = True | ||
| deduped_artifact_with_exclusion = duplicate_artifact | ||
| if verbose and not found_artifact_with_exclusion: |
There was a problem hiding this comment.
Does this actually happen? Should this be a failure instead?
There was a problem hiding this comment.
I'm not sure if this ever happens.
It did not happen for any of the builds I tested, and since in the past we always took the first one in the list regardless of exclusion I didn't think we should create an error here now. It seemed like the logging might useful for future debugging if there are errors with exclusions though.
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.
When we de-duplicate artifacts from coursier we just take the first artifact in the list. This is sometimes breaking artifacts that specify exclusions because the first artifact in the list may not match the exclusions for the dependency. The result is that you specify exclusions but nothing is excluded.
This PR fixes the de-duplication logic so it will select the duplicate artifact with the correct exclusions.
Since this also re-arranged the artifacts in the list I also sorted the list after all of the de-duplication was done. Sorting the artifacts based on their file path does re-arrange the sorting from coursier though.