-
-
Notifications
You must be signed in to change notification settings - Fork 63
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
Renovate bot support for automerge by update type #701
Comments
Good idea! After looking at your example PR, I think we can parse the version numbers from the pull request body to determine the upgrade type |
Thanks! I'm adding some more PRs as reference: |
@erezrokah Thanks for the links! It looks like handling dependency updates like netlify/cli#2998 is similar to handling Dependabot updates. The GitHub Action dependency update (netlify/cli#2997) doesn't follow semver, but I think we can just ignore the I was thinking we would consider the lock file update for netlify/cli#2999 a "minor" version upgrade for Kodiak's auto merge purposes. |
@erezrokah I was looking at the Renovate docs and was wondering where Renovate's auto merge falls short. It looks like Renovate supports auto merging by update type here: https://docs.renovatebot.com/automerge-configuration/#automerge-non-major-updates |
Thanks @chdsbd, that's a very good question. Renovate auto merge falls short when a branch has the I would like Kodiak to efficiently sync those renovates PRs, and have renovate only update the PR when it's conflicted (by setting I thought about opening an issue on Renovate's side, but I think since it's doesn't have the full context of the PRs queue, it has to be done on Kodiak's side. Please let me know if that makes sense. |
I think setting By default, Kodiak will efficiently update the PR right before merging. |
I now realize we still need to update Kodiak to support auto merging Renovate PRs by update type. However, if you want to auto merge all Renovate PRs, adding the automerge label will work |
💯
Correct, however we can't auto merge Renovate major version updates PRs, as they usually contain breaking changes and require user intervention |
This change supports auto merging Renovate PRs by update type. related #701
I've released a new version of Kodiak with support for auto merging Renovate PRs by upgrade type. I used the PRs you linked as test cases, so those examples you gave should work in the future. The Kodiak docs on Dependabot should be applicable to Renovate: https://kodiakhq.com/docs/recipes#automated-dependency-updates-with-dependabot-or-renovate Let me know if you run into any issues. |
Looks like this is working, see netlify/eslint-config-node#287. Thanks @chdsbd 🥳 |
Not sure if to open a new issue for it, but we probably want to match netlify/cli#3273 as well. Happy to learn of another way to put those into the Kodiak's merge queue automatically. |
@erezrokah I think Kodiak should auto merge that PR as a "patch" update. There's a test using netlify/cli#2999 as an example: https://github.com/chdsbd/kodiak/blob/06a92425ac4869695e4a77e8d815745e2ebd35c6/bot/kodiak/tests/dependencies/renovate_pull_requests/update-patch-lock_file_maintenance.txt I think that PR isn't merging because |
Woo, I missed that. Thank you for clarifying ❤️ |
From looking at this regex:
kodiak/bot/kodiak/dependencies.py
Line 6 in 87cdec3
looks like the following guide will only work for dependabot as renovate bot PR titles are a bit different.
See netlify/cli#3016. The title is
fix(deps): update dependency @netlify/build to ^17.1.1
so the version type will not be detected.Please let me know if I got this wrong or there's another way to handle it (I could configure the renovate PR title, but it feels this should work with the default one).
The text was updated successfully, but these errors were encountered: