feat(platform): re-attempt platform automerge on github and gitlab

[straub]

Changes

This change will cause Renovate to re-enable GitHub's automerge / Merge Queue feature after rebasing the PR, to more seamlessly recover when PRs encounter merge conflicts in the queue and are removed by github-merge-queue[bot].

This is a naive first pass at the feature, and I'm submitting this PR as a work-in-progress to get feedback. I suspect, among other potential feedback, that my testing needs to be improved and that it's possible the new feature should be opt-in via a new config flag (not yet added).

Thanks for your time!

Context

#26523

Documentation (please check one with an [x])

• I have updated the documentation, or
• No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

• Code inspection only, or
• Newly added/modified unit tests, or
• No unit tests but ran on a real repository, or
• Both unit tests + ran on a real repository

[HonkingGoose]

I'm unsure whether this is needed. I have not included a doc update in this PR yet.

The new behavior should be explained in Renovate's platformAutomerge docs. Currently those docs say:

Renovate tries platform-native automerge only when it initially creates the PR. Any PR that is being updated will be automerged with the Renovate-based automerge.

But your PR makes it so that Renovate enables the platform native automerge (GitHub Merge queue in this case) again after a merge conflict, I think. So that should be explained.

[rarkins]

I think that the refreshPr for bitbucket is such a different use - and called at different times where re-enabling automerge is not relevant - that it's probably not a good idea to combine it

[straub]

I've refactored this implementation to avoid using/changing refreshPr. Now using a new method called reattemptPlatformAutomerge()

[HonkingGoose]

Needs more work after applying the suggestion.

[rarkins]

LGTM but needs tests passing

[straub]

LGTM but needs tests passing

Tests are now passing! Please let me know if this needs anything else

[rarkins]

Is there still any concern about feature parity with gitlab? I recall a comment being added her earlier about it

[straub]

Is there still any concern about feature parity with gitlab? I recall a comment being added her earlier about it

I was looking for some direction on that in relation to the docs:

1. feat(platform): re-attempt platform automerge on github and gitlab  #26567 (comment)
2. feat(platform): re-attempt platform automerge on github and gitlab  #26567 (comment)

It's not strictly a part of this change, but I'd be happy to cover it while I'm in here

[renovate-release]

🎉 This PR is included in version 37.255.0 🎉

The release is available on:

• GitHub release
• npm package (@latest dist-tag)
• 37.255.0

Your semantic-release bot 📦🚀