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

[Feature Request] Configure rebasing strategy for dependabot created PRs #16099

Open
sandeshkr419 opened this issue Sep 26, 2024 · 6 comments · May be fixed by #16163
Open

[Feature Request] Configure rebasing strategy for dependabot created PRs #16099

sandeshkr419 opened this issue Sep 26, 2024 · 6 comments · May be fixed by #16163
Assignees
Labels
enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers

Comments

@sandeshkr419
Copy link
Contributor

sandeshkr419 commented Sep 26, 2024

Is your feature request related to a problem? Please describe

Majorly with version upgrades, the PR becomes stale and a maintainer needs to manually trigger @dependabot recreate to recreate the PR. Also, with backport PRs the major concerns are with resolving merge conflicts manually because of the tagret/source branch are out of sync.

Describe the solution you'd like

Configuring up rebase-strategy in these cases can help reduce the manual involvement and dependency on maintainers to rebase changes.

Related component

Build

Describe alternatives you've considered

Can use default configuration which is rebase-strategy: auto. Also, can configure it to reduce the frequency of rebasing.

Not sure if we can do the same with opensearch-trigger-bot or not.
Presently, as of 9/26, we have 20 open PRs from both these bots combined.

Additional context

This can potentially help us move version upgrades & backport PRs move a lot faster and will certainly reduce the backlog we have built with so many version upgrade languishing PRs.

@sandeshkr419 sandeshkr419 added enhancement Enhancement or improvement to existing feature or request untriaged labels Sep 26, 2024
@github-actions github-actions bot added the Build Build Tasks/Gradle Plugin, groovy scripts, build tools, Javadoc enforcement. label Sep 26, 2024
@sandeshkr419 sandeshkr419 added good first issue Good for newcomers and removed Build Build Tasks/Gradle Plugin, groovy scripts, build tools, Javadoc enforcement. labels Sep 26, 2024
@sandeshkr419 sandeshkr419 changed the title [Feature Request] Configure rebasing strategy for dependabot [Feature Request] Configure rebasing strategy for dependabot created PRs Sep 26, 2024
@prateekrai1
Copy link

Can I take up this issue?

@sandeshkr419
Copy link
Contributor Author

That would be great @prateekrai1 - please feel free to jot down your ideas here or/and open up a (draft) PR to discuss if you have something that would solve the issue. I'll assign the issue to you for now.

@prateekrai1
Copy link

Hello @sandeshkr419, I have raised PR . Can you please review it and let me know?

@prateekrai1 prateekrai1 linked a pull request Oct 2, 2024 that will close this issue
3 tasks
@jainankitk
Copy link
Collaborator

Related issue: #15149

@dblock dblock removed the untriaged label Oct 14, 2024
@dblock
Copy link
Member

dblock commented Oct 14, 2024

[Catch All Triage - 1, 2, 3, 4]

@prateekrai1
Copy link

I have come up with a possible solution for backport PRs and Stalled PRs:

I use the Github search API to identify stalled PRs and backport PRs
Backport PRs:

  1. Fetch all backport PRs with the backport label.
  2. Handle CHANGELOG.md conflicts by preserving both old and new changes.
  3. Commit and push the resolved file back to the branch.

Stalled PRs:

  1. Fetch all stalled PRs with the stalled label.
  2. Rebase PRs onto the latest target branch and push updates.

I will integrate it with Jenkins and will trigger a pipeline whenever a Stalled PR or Backport PR is created.
Do I need to store the old CHANGELOG.md files in a separate folder explicitly or is the github versioning enough?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers
Projects
None yet
Development

Successfully merging a pull request may close this issue.

4 participants