fix dependency duplication across multiple groups #8106
Merged
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
jakecoffman
force-pushed
the
jakecoffman/fix-grouping-duplication
branch
from
7eb5668
to
156313a
Compare
jakecoffman
changed the title
|
Hi! Has this change been deployed already? (As part of https://github.com/dependabot/dependabot-core/releases/tag/v0.233.0) It's just that we're still seeing duplication, which I had thought would be fixed by this. For example, this grouped PR includes the ...even though they are covered by this (earlier in the Dependabot config definition) group: Our Dependabot config is here: And I reported this originally here: Which was then marked as a duplicate of #7915 (which this PR closed). |
|
The logs of the most recent Dependabot retrigger:
|
This was referenced Oct 6, 2023
brettfo
pushed a commit
to brettfo/dependabot-core
that referenced
this pull request
Oct 11, 2023
1 task
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.
fixes #7915 and possibly others
If you define multiple groups that all match the same dependencies, the dependencies will show up in each PR.
This fix takes the dependencies that have already been handled and adds them to a Set in the DependencySnapshot that we can use to skip dependencies that have already been handled in previous groups.
This also adds pre-processing of the existing pull requests. This is needed because imagine due to semver grouping, or a change in the manifest, a PR is created for a certain dependency and the PR is still open. That group may be further down the list, but now an earlier group wants to create a PR with that dependency. Unless we pre-process the existing PRs, then it will create a duplicate again.
And finally when encountering an existing grouped PR, this now adds the dependencies listed in the existing PR record of the job definition, rather than the ones calculated from patterns, etc. This means if a group happens to also update a dependency outside of the group, like for instance because it has a peer-dependency on it, Dependabot won't open another PR bumping it.