diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 603224c..138c34e 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -4,7 +4,7 @@ on: pull_request_target: types: [opened, synchronize, reopened, ready_for_review] # Repositories with a merge queue require this workflow on the queue's merge groups too. There is - # nothing to request there, so the job is skipped and the workflow reports success. + # nothing to request there; the merge-group job only lets the run conclude as a success. merge_group: permissions: @@ -12,6 +12,13 @@ permissions: pull-requests: read jobs: + merge-group: + if: github.event_name == 'merge_group' + runs-on: ubuntu-latest + steps: + - name: Nothing to request for a merge group + run: echo "The merge queue's required checks decide this merge." + request-auto-merge: if: >- github.event_name == 'pull_request_target' && diff --git a/README.md b/README.md index 6ac5342..b1be3ab 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ events that invoke the organization workflow. The organization ruleset applies this workflow to Chio Labs public repositories. -The workflow also runs on merge queue groups, because the ruleset requires it there; its job is -skipped and it reports success, leaving the queue's own required checks to decide. +The workflow also runs on merge queue groups, because the ruleset requires it there. A no-op job +lets that run succeed, leaving the queue's own required checks to decide. Draft and fork-based pull requests are intentionally excluded. A draft is handled when it becomes ready for review. Product workflows remain responsible for release-specific validation, while this