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.

Sign up for GitHub

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

Jump to bottom

chore(renovate): only rebase on conflict #546

Merged
merged 1 commit into from
Apr 26, 2024
Merged

chore(renovate): only rebase on conflict #546

merged 1 commit into from
Apr 26, 2024

Conversation

bkrem
Copy link
Member

@bkrem bkrem commented Apr 26, 2024 •
edited
Loading

Context

  • Renovatebot is very trigger-happy with rebasing its PRs immediately when it falls behind the base branch, even if not conflicted.
  • This is causing Vercel deployment floods unnecessarily and clogging up the deployment pipeline in other Vercel projects outside of our examples
  • See: https://docs.renovatebot.com/updating-rebasing/

Solution

  • Only rebase when conflicted. If that still doesn't help we can move to rebaseWhen: "never" for full manual control

@vercel Vercel
Copy link

vercel bot commented Apr 26, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
react-wallet-v2 🛑 Canceled (Inspect) Apr 26, 2024 1:22pm

@vercel vercel bot temporarily deployed to Preview – react-wallet-v2 April 26, 2024 13:22 Inactive
lukaisailovic
lukaisailovic approved these changes Apr 26, 2024
View reviewed changes
Copy link
Collaborator

@lukaisailovic lukaisailovic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed last commit from Renovate. Thanks for fixing 🙏

@bkrem bkrem merged commit 7289d7a into main Apr 26, 2024
4 of 18 checks passed
@bkrem bkrem deleted the chore/adjust-renovate-rebase-policy branch April 26, 2024 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukaisailovic lukaisailovic lukaisailovic approved these changes

@ganchoradkov ganchoradkov Awaiting requested review from ganchoradkov

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bkrem @lukaisailovic