-
Notifications
You must be signed in to change notification settings - Fork 970
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
[Fix] multi-directory grouped updates sometimes create ungrouped PRs #9938
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
I think we can still use the specs and silent ecosystem tests from #9610 in this |
Nishnha
force-pushed
the
nishnha/handled-dependency-group
branch
from
June 20, 2024 07:12
e208228
to
fd5f82e
Compare
Nishnha
force-pushed
the
nishnha/propagate-directory
branch
from
June 20, 2024 07:12
98aabc0
to
2edad0e
Compare
Nishnha
force-pushed
the
nishnha/handled-dependency-group
branch
from
June 20, 2024 08:13
30f0644
to
1afe4e6
Compare
Nishnha
force-pushed
the
nishnha/handled-dependency-group
branch
2 times, most recently
from
June 20, 2024 16:14
e3a9685
to
db8b2d3
Compare
…dependencies-for-multidir
Nishnha
force-pushed
the
nishnha/handled-dependency-group
branch
from
June 20, 2024 16:48
d2a939a
to
88d39c7
Compare
landongrindheim
approved these changes
Jun 20, 2024
Nishnha
force-pushed
the
nishnha/handled-dependency-group
branch
from
June 20, 2024 18:11
fedfbeb
to
766eab7
Compare
Nishnha
force-pushed
the
nishnha/propagate-directory
branch
from
June 20, 2024 19:26
8a16bc8
to
0a3e581
Compare
Nishnha
force-pushed
the
nishnha/handled-dependency-group
branch
from
June 20, 2024 19:28
766eab7
to
88d39c7
Compare
updated_dependencies
Co-authored-by: Landon Grindheim <landon.grindheim@gmail.com>
Nishnha
force-pushed
the
nishnha/propagate-directory
branch
from
June 20, 2024 19:48
39600d2
to
8962ae7
Compare
Nishnha
force-pushed
the
nishnha/propagate-directory
branch
from
June 20, 2024 19:54
8962ae7
to
dfe9c96
Compare
5 tasks
5 tasks
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.
What are you trying to accomplish?
Depends on #9988
This PR is stacked on top of #9988
Multi-directory grouped updates sometimes create ungrouped PRs because the #run_ungrouped_dependency_updates method relied on some old assumptions that have changed.
#run_ungrouped_dependency_updates
makes use ofDependencySnapshot#ungrouped_dependencies
to check which dependencies do not belong to a group and require an individual PR.This used to work, but we recently changed the way we calculate if a dependency belongs to a group with the introduction of multi-directory updates.
When Dependabot could only update 1 directory at a time, marking a dependency as "handled" with
DependencySnapshot#add_handled_dependencies
meant that it had been processed.When we added multi-directory updates, we kept track of
handled_dependencies
per directory in case we handle a dependency in one directory and don't skip over it in a later directory.This meant that when we changed the
current_directory
in theDirectorySnapshot
, we lost the list ofhandled_dependencies
, so dependencies belonging to an existing pull request group are not considered handled and are included in theungrouped_dependencies
list.To account for this, this PR introduces
DependencySnapshot#add_handled_group_dependencies
andDependencySnapshot#handled_group_dependencies
to mark every dependency in a group as handled across all directories and retrieve them.Anything you want to highlight for special attention from reviewers?
This work depends on a few other PRs which also share the
:dependency_has_directory
feature flag. These other PRs add in adirectory
field toDependabot::Dependency
that this PR uses to track which dependencies are handled.How will you know you've accomplished your goal?
We have a silent ecosystem test in this PR. This is also feature flagged so we can test it out on our test repo.
Checklist