Skip to content
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

[Updater] When a Dependency Group is refreshed as part of a scheduled GroupUpdateAllVersions, it defers rebasing #7432

Conversation

brrygrdn
Copy link
Contributor

Fix for #7310

When testing #7310 yesterday we realised that any attempt to 'rebase', i.e. call the update_pull_request endpoint, from within a scheduled GroupUpdateAllVersions job fails as the endpoint expects the job to specify a single target PullRequest to update.

After discussing this, we realised that having rebases happen within the scheduled job is something we can and should defer - rebases should honour the user configuration and only be triggered when the branch goes into conflict, it's not intentional nor well understood that we rebase during a schedule for some PRs right now.

This change course-corrects our approach so that the delegation to the RefreshGroupUpdatePullRequest will defer rebases but will replace or supersede PRs if the dependencies or versions involved have changed respectively.

@brrygrdn brrygrdn requested a review from a team as a code owner June 14, 2023 11:13
@brrygrdn brrygrdn merged commit 4ae5aaf into brrygrdn/group-update-all-refreshes-existing-prs Jun 14, 2023
78 checks passed
@brrygrdn brrygrdn deleted the brrygrdn/scheduled-updates-do-not-rebase branch June 14, 2023 11:49
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.

None yet

2 participants