Skip to content

Commit 87edfbc

Browse files
committed
move required status checks into Merge Queue ruleset
1 parent c528cf6 commit 87edfbc

2 files changed

Lines changed: 19 additions & 17 deletions

File tree

‎.asf.yaml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,6 @@ github:
3535
rebase: true
3636
protected_branches:
3737
main:
38-
required_status_checks:
39-
contexts:
40-
# Repository policy and security checks.
41-
- Analyze Actions
42-
- Run zizmor 🌈
43-
- asf-allowlist-check
44-
- rat
45-
46-
# Documentation checks.
47-
- docs
48-
- markdown-link-check
49-
50-
# Python workflow gates.
51-
- python-ci-required
52-
- python-integration-required
53-
5438
required_pull_request_reviews:
5539
required_approving_review_count: 1
5640

@@ -65,6 +49,24 @@ github:
6549
- "~DEFAULT_BRANCH"
6650
exclude: []
6751
rules:
52+
- type: required_status_checks
53+
parameters:
54+
# Merge Queue already tests each entry against the latest main
55+
strict_required_status_checks_policy: false
56+
required_status_checks:
57+
# Repository policy and security checks.
58+
- context: Analyze Actions
59+
- context: Run zizmor 🌈
60+
- context: asf-allowlist-check
61+
- context: rat
62+
63+
# Documentation checks.
64+
- context: docs
65+
- context: markdown-link-check
66+
67+
# Python workflow gates.
68+
- context: python-ci-required
69+
- context: python-integration-required
6870
- type: merge_queue
6971
parameters:
7072
check_response_timeout_minutes: 90

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ lives under `pyiceberg/`, organized by concern rather than by engine:
6868

6969
### Required CI and Merge Queue
7070

71-
- Keep the `required_status_checks.contexts` list in `.asf.yaml` synchronized whenever a required job/check is added, renamed, or removed. Each entry is a job/check context name, not a workflow filename.
71+
- Keep the `required_status_checks` list in the `Merge Queue` ruleset in `.asf.yaml` synchronized whenever a required job/check is added, renamed, or removed. Each entry is a job/check context name, not a workflow filename.
7272
- Verify that every required context reports for both `pull_request` and `merge_group`. Its producer workflow must run on both events.
7373
- When a workflow uses an aggregate required job, such as `python-ci-required`, keep `if: always()` and its `needs` list in sync with every job whose result should block merging.
7474
- Do not use `pull_request` path filters in workflows that produce required contexts. A skipped workflow does not report its required context, which blocks pull requests and causes Merge Queue entries to time out.

0 commit comments

Comments
 (0)