Skip to content

fix(pr): wait until auto-merge is allowed - #630

Merged
dblinkhorn merged 4 commits into
grafana:mainfrom
julienduchesne:julienduchesne/wait-for-pr-mergeable
Oct 8, 2026
Merged

dblinkhorn merged 4 commits into
grafana:mainfrom
julienduchesne:julienduchesne/wait-for-pr-mergeable

Conversation

@julienduchesne

Copy link
Copy Markdown
Contributor

Summary

Wait for GitHub to report an auto-merge PR as clean before calling the merge API, avoiding repeated branch-protection errors while approvals are pending.

  • Keep polling for blocked, conflicting, or still-computing merge states
  • Log the current mergeable state while waiting

@julienduchesne
julienduchesne marked this pull request as ready for review September 11, 2026 13:28
@julienduchesne
julienduchesne requested a review from a team as a code owner September 11, 2026 13:28
@dblinkhorn

Copy link
Copy Markdown
Contributor

@juliajohannesen @julienduchesne Is this still needed?

@julienduchesne

julienduchesne commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor Author

Yes, we are probably still causing security alerts by attempting invalid merges continuously

@dblinkhorn
dblinkhorn added this pull request to the merge queue Oct 7, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 7, 2026
@dblinkhorn

Copy link
Copy Markdown
Contributor

@julienduchesne we have angered CI

@dblinkhorn
dblinkhorn added this pull request to the merge queue Oct 8, 2026
Merged via the queue into grafana:main with commit adc49b7 Oct 8, 2026
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants