diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 7ef7accc..15050096 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -26,13 +26,14 @@ We use a skip pattern so the same required checks pass in both PR and merge queu ### How It Works -All workflows specify explicit branch targeting: +All workflows specify explicit branch targeting and the `checks_requested` type: ```yaml on: pull_request: branches: [main] merge_group: + types: [checks_requested] branches: [main] workflow_dispatch: # Enables manual triggering for testing ``` @@ -71,7 +72,7 @@ In GitHub branch protection rules, require these checks: All checks will pass in both PR and merge queue contexts (either by running or by being skipped). -**Note**: The explicit branch targeting in `merge_group` triggers is critical for workflows to run properly in the merge queue. Without this, GitHub may not trigger the workflows and they will remain in "expected" state. +**Note**: The explicit `types: [checks_requested]` and branch targeting in `merge_group` triggers is critical for workflows to run properly in the merge queue. The `types` parameter is recommended by GitHub to future-proof against new activity types. Without proper configuration, GitHub may not trigger the workflows and they will remain in "expected" state. ## Workflow Details diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index b1940f21..fe382734 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -8,6 +8,7 @@ on: branches: [main] # Run in merge queue but skip the step (shows as passing check) merge_group: + types: [checks_requested] branches: [main] workflow_dispatch: diff --git a/.github/workflows/claude-code-test.yml b/.github/workflows/claude-code-test.yml index 7a113ff6..f1304664 100644 --- a/.github/workflows/claude-code-test.yml +++ b/.github/workflows/claude-code-test.yml @@ -14,6 +14,7 @@ on: branches: [main] # Run in the merge queue to validate before merging merge_group: + types: [checks_requested] branches: [main] # Ensure only one instance runs at a time per PR/branch diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a463b777..2bc50f15 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -4,6 +4,7 @@ on: pull_request: branches: [main] merge_group: + types: [checks_requested] branches: [main] workflow_dispatch: