Skip to content

Commit 351675d

Browse files
blagininclaude
andauthored
Prepare for Merge Queue (#17183)
* Github Merge Queue CI * fix large files check * Prepare for Merge Queue * Remove MQ triggers for non-mandatory actions * ind typo * fix: prevent duplicate workflow runs in merge queue Add branches-ignore for 'gh-readonly-queue/**' to workflows with push triggers to prevent duplicate runs when PRs enter the merge queue. GitHub triggers both push and merge_group events for the same change, causing cancellations. - rust.yml: added branches-ignore - dependencies.yml: added branches-ignore - audit.yml: reordered branches/paths (already restricted to main) This fixes "Canceling since a higher priority waiting request" errors. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Kill strict * Tagging shouldn't be required MQ stage * Branches ignore for dev --------- Co-authored-by: Claude <[email protected]>
1 parent 48cb9f3 commit 351675d

File tree

6 files changed

+57
-5
lines changed

6 files changed

+57
-5
lines changed

.asf.yaml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,36 @@ github:
5050
main:
5151
required_pull_request_reviews:
5252
required_approving_review_count: 1
53+
required_status_checks:
54+
contexts:
55+
- "Check License Header"
56+
- "cargo doc"
57+
- "build and run with wasm-pack"
58+
- "linux build test"
59+
- "cargo test (macos-aarch64)"
60+
- "Verify Vendored Code"
61+
- "Check cargo fmt"
62+
- "Verify MSRV (Min Supported Rust Version)"
63+
- "cargo check datafusion-common features"
64+
- "cargo check datafusion-substrait features"
65+
- "cargo check datafusion-proto features"
66+
- "cargo check datafusion features"
67+
- "cargo check datafusion-functions features"
68+
- "cargo test (amd64)"
69+
- "cargo examples (amd64)"
70+
- "cargo test doc (amd64)"
71+
- "verify benchmark results (amd64)"
72+
- "Run sqllogictest with Postgres runner"
73+
- "Run sqllogictest in Substrait round-trip mode"
74+
- "cargo test pyarrow (amd64)"
75+
- "clippy"
76+
- "check Cargo.toml formatting"
77+
- "Use prettier to check formatting of documents"
78+
- "check-files"
79+
- "cargo test datafusion-cli (amd64)"
80+
- "check configs.md and ***_functions.md is up-to-date"
5381
# needs to be updated as part of the release process
54-
# Github doesn't support wildcard branch protection rules, only exact branch names
82+
# .asf.yaml doesn't support wildcard branch protection rules, only exact branch names
5583
# https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file#branch-protection
5684
# Keeping set of protected branches for future releases
5785
# Meanwhile creating a prerelease script that will update the branch protection names
@@ -122,6 +150,7 @@ github:
122150
pull_requests:
123151
# enable updating head branches of pull requests
124152
allow_update_branch: true
153+
allow_auto_merge: true
125154

126155
# publishes the content of the `asf-site` branch to
127156
# https://datafusion.apache.org/

.github/workflows/audit.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,18 @@ concurrency:
2323

2424
on:
2525
push:
26+
branches:
27+
- main
2628
paths:
2729
- "**/Cargo.toml"
2830
- "**/Cargo.lock"
29-
branches:
30-
- main
3131

3232
pull_request:
3333
paths:
3434
- "**/Cargo.toml"
3535
- "**/Cargo.lock"
36+
37+
merge_group:
3638

3739
jobs:
3840
security_audit:

.github/workflows/dependencies.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,16 @@ concurrency:
2323

2424
on:
2525
push:
26+
branches-ignore:
27+
- 'gh-readonly-queue/**'
2628
paths:
2729
- "**/Cargo.toml"
2830
- "**/Cargo.lock"
2931
pull_request:
3032
paths:
3133
- "**/Cargo.toml"
3234
- "**/Cargo.lock"
35+
merge_group:
3336
# manual trigger
3437
# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
3538
workflow_dispatch:

.github/workflows/dev.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
# under the License.
1717

1818
name: Dev
19-
on: [push, pull_request]
19+
on:
20+
push:
21+
branches-ignore:
22+
- 'gh-readonly-queue/**'
23+
pull_request:
24+
merge_group:
2025

2126
concurrency:
2227
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}

.github/workflows/large_files.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ concurrency:
2323

2424
on:
2525
pull_request:
26+
merge_group:
2627

2728
jobs:
2829
check-files:
@@ -38,7 +39,16 @@ jobs:
3839
MAX_FILE_SIZE_BYTES: 1048576
3940
shell: bash
4041
run: |
41-
git rev-list --objects ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} \
42+
if [ "${{ github.event_name }}" = "merge_group" ]; then
43+
# For merge queue, compare against the base branch
44+
base_sha="${{ github.event.merge_group.base_sha }}"
45+
head_sha="${{ github.event.merge_group.head_sha }}"
46+
else
47+
# For pull requests
48+
base_sha="${{ github.event.pull_request.base.sha }}"
49+
head_sha="${{ github.event.pull_request.head.sha }}"
50+
fi
51+
git rev-list --objects ${base_sha}..${head_sha} \
4252
> pull-request-objects.txt
4353
exit_code=0
4454
while read -r id path; do

.github/workflows/rust.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ concurrency:
2323

2424
on:
2525
push:
26+
branches-ignore:
27+
- 'gh-readonly-queue/**'
2628
paths-ignore:
2729
- "docs/**"
2830
- "**.md"
@@ -34,6 +36,7 @@ on:
3436
- "**.md"
3537
- ".github/ISSUE_TEMPLATE/**"
3638
- ".github/pull_request_template.md"
39+
merge_group:
3740
# manual trigger
3841
# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
3942
workflow_dispatch:

0 commit comments

Comments
 (0)