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.

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

Github Branch Protections and smart strict merging can cause deadlock #1372

Closed
melink14 opened this issue Sep 12, 2020 · 3 comments
Closed

Comments

@melink14
Copy link

As per the example configs, we setup a mergify config that should merge whenever Github branch protections are satisfied.

We also setup smart+fasttrack strict mode in order to avoid breakages in master.

This seemed to work well, but it ordered the PRs such that the ones waiting on approval were ahead of the the ones which were ready (except needing to be updated) and thus the queue never moved (until I approved the waiting PRs).

Feature Request: Send PRs to the back of the queue if they are waiting on Branch Protections (there may be other similar interactions).

Current workarounds:

  • Don't use smart and waste some cylces. This is not too uncommon for bots in Github universe but seems unnecessary.
  • Add an approvals condition to mergify since that's unlikely to change and is the only condition that requires human involvement.

Do devs have an opinion on what course of action is canonical?

Thanks!

@jd
Copy link
Member

jd commented Sep 14, 2020

Thanks for the report! One of the issues that pop up often is #448. Unfortunately, the GitHub API does not offer a documented and reliable way to know when the branch protections are satisfied.

We'll try to implement a workaround in the future, we'll see how that goes. I know @sileht has a few ideas. :)

@sileht
Copy link
Member

sileht commented Sep 30, 2020

The workaround is live now, the queue should not block anymore.

@jd
Copy link
Member

jd commented Oct 1, 2020

Closing this, feel free to reopen if that happens again.

@jd jd closed this as completed Oct 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

No branches or pull requests

3 participants