auto-update confuses dependabot

[Zemnmez]

Hey there :) this is a really awesome action! only issue is that dependabot stops rebasing its PRs if they have any non-dependabot commits. Is it possible to make this exclude some set of authors?

Example:

zemn-me/monorepo#520

[tibdex]

Hi!

Why do you need dependabot PRs to be rebased by the dependabot app if auto-update already updates them?

[Zemnmez]

Hi there @tibdex! So Dependabot often gets into situations in which github / git's automatic merging is not possible or not enough. For example, if the main branch updates a dependency lib.js to 1.2.0 and Dependabot wants to modify that same dependency Dependabot's PR becomes not mergable via normal methods, because the lock file is complicated.

Because of this, Dependabot automatically rebases itself against the branch every time it runs, and resolves these issues automatically. In the Javascript ecosysem, tools like npm and yarn detect conflict markers and merge them.

In order to prevent dependabot from breaking a change someone else has contributed to, it stops this logic as soon as it detects any change that isn't from dependabot:

This eventually gets dependabot in a broken state where either the normal logic cannot execute to rebase the PR, or as pictured, the change needs to be updated to a new version and it cannot because it contains foreign commits.

Thanks!

[stefreak]

@Zemnmez Great explanation why you would want to do that!

You can ignore dependabot changes in your workflow. just change the push trigger to:

push:
  branches-ignore:
    - dependabot/**

Maybe this should be changed in the example workflow.

EDIT: Unfortunately, this is not a working workaround. The auto-update will always paginate through all pull requests. So the filter needs to be implemented in auto-update. Sorry for the confusion

[psteinroe]

same issue for renovate 👍

[Zemnmez]

I’ve switched to using merge queues instead of auto-update, and that works a charm. Saves a lot of actions CPUs too.

…

On 24 Oct 2023, at 08:09, Philipp Steinrötter ***@***.***> wrote: same issue for renovate 👍 — Reply to this email directly, view it on GitHub <https://www.google.com/url?q=https://github.com/tibdex/auto-update/issues/14%23issuecomment-1777445046&source=gmail-imap&ust=1698764972000000&usg=AOvVaw3IGIB-VAsM0Z1lGonyAixB>, or unsubscribe <https://www.google.com/url?q=https://github.com/notifications/unsubscribe-auth/ABDJGLWMBNZ6IQ2KMI3FK23YA7K2RAVCNFSM53CCSGXKU5DIOJSWCZC7NNSXTN2JONZXKZKDN5WW2ZLOOQ5TCNZXG42DINJQGQ3A&source=gmail-imap&ust=1698764972000000&usg=AOvVaw3OPYHX4MuQ3gKTi8s5g9tA>. You are receiving this because you were mentioned.