github/mergify: set an explicit "update" account #1809
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1793
See our issue, upstreams issue, and this discussion I had with upstream.
The core problem is also summarised nicely in this comment on another affected project:
Who to set
I've marked @GaetanLepage as the "update account", so pushing rebased changes will use his account.
I'm also happy to put my name there, but I think @GaetanLepage made more sense as he is the most "senior" and most active maintainer.
This should be fairly invisible though, because when rebasing, mergify sets committer and author matching the original commit's.
This also only affects the push to the PR branch,
Mergify[bot]
is still used to actually merge the PR into the base branch.The future
update_bot_account
is a "template" type (the default is{{author}}
). I've suggested that Mergify add a "known to mergify" filter, which would allow us to filter a list of users (e.g.approved-reviews-by.prepend(author).append(GaetanLepage)
) and then filter that list for users that have logged into Mergify's dashboard, (then finally filtering for thefirst
matching user). See the discussion mentioned above.