fix: Use workflow_run trigger for automerge (#89)

## Summary
- Fixes the automerge workflow that was merging PRs immediately without
waiting for CI
- Replaces `gh pr merge --auto` (requires branch protection) with a
`workflow_run` trigger that fires after CI completes
- When CI passes on a PR with the "Automerge" label, the PR is
squash-merged automatically

## Test plan
- [x] Merge this PR manually to get the workflow on `main`
- [x] Create a test PR, add the "Automerge" label, and verify it only
merges after CI passes
This commit is contained in:
Víctor Falcón 2026-01-31 18:44:37 +01:00 committed by Víctor Falcón
parent 6aa9da3df3
commit dfd8bf8092
1 changed files with 27 additions and 6 deletions

View File

@ -1,19 +1,40 @@
name: Automerge
on:
pull_request:
types: [labeled]
workflow_run:
workflows: ["CI"]
types: [completed]
jobs:
automerge:
if: github.event.label.name == 'Automerge'
if: >
github.event.workflow_run.conclusion == 'success' &&
github.event.workflow_run.event == 'pull_request'
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- name: Enable auto-merge
run: gh pr merge --auto --squash "$PR_URL"
- name: Merge PR with Automerge label
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO: ${{ github.repository }}
run: |
HEAD_BRANCH="${{ github.event.workflow_run.head_branch }}"
PR_NUMBER=$(gh pr list --repo "$REPO" --head "$HEAD_BRANCH" --state open --json number --jq '.[0].number')
if [ -z "$PR_NUMBER" ] || [ "$PR_NUMBER" = "null" ]; then
echo "No open PR found for branch $HEAD_BRANCH"
exit 0
fi
HAS_LABEL=$(gh pr view "$PR_NUMBER" --repo "$REPO" --json labels --jq '[.labels[].name] | map(select(. == "Automerge")) | length')
if [ "$HAS_LABEL" -eq 0 ]; then
echo "PR #$PR_NUMBER does not have Automerge label, skipping"
exit 0
fi
echo "PR #$PR_NUMBER has Automerge label and CI passed. Merging..."
gh pr merge "$PR_NUMBER" --squash --repo "$REPO" --delete-branch