diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 54da42a..d4b88e1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -1,5 +1,12 @@ name: Automerge +# Triggers: +# - pull_request: fires when PR is opened, labeled, updated, etc. +# Handles the case where the label is added after CI already passed. +# - workflow_run (CI): fires after the CI workflow completes. +# This is needed because check_suite and status events don't reliably +# fire for workflows on the same commit (GitHub prevents infinite loops). +# Without this, the automerge action never retries after CI passes. on: pull_request: types: @@ -14,10 +21,10 @@ on: pull_request_review: types: - submitted - check_suite: + workflow_run: + workflows: ["CI"] types: - completed - status: {} env: FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true