Skip to content

Commit 5c097fd

Browse files
authored
chore: Rust checks are required + merge queue (#21941)
Closes #6880 Follow up on #17538 and #21239 #21239 seems to be working fine - time to make all the rust changes required to merge it. This brings two cool things: 1. The most important one - the "merge when ready" button now works 🚀 <img width="923" height="285" alt="image" src="https://github.com/user-attachments/assets/4f11ecb6-e1d9-473f-815f-b57488042dd3" /> You can click this button any time, even right after opening a PR. It will be automatically merged when: - all required CI checks (which now include rust) are passing - you get an approval I think this should help quite a bit. A lot of people get an approval, push a nit, and then sit waiting for CI to finish. No more waiting!! 2. We protect ourselves from logical conflicts: cases where develop was passing before, but someone merged something in the meantime and now your change is broken on develop - and you don't find out until after you merge. We hit this almost every month. One downside: before, clicking merge would happen instantly (although you had **manually** to wait for tests to be green). With this PR, you won't have to wait, but it will take 16 minutes to merge (plus, 16 more to put in the merge queue if you just pushed). But github will do the work itself and ensure tests are passing on the latest `main`.
1 parent 574326c commit 5c097fd

2 files changed

Lines changed: 25 additions & 5 deletions

File tree

.asf.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,29 @@ github:
6060
- "Spell Check with Typos"
6161
- "Circular Dependency Check"
6262
- "Detect Unused Dependencies"
63+
- "linux build test"
64+
- "cargo check datafusion-common features"
65+
- "cargo check datafusion-substrait features"
66+
- "cargo check datafusion-proto features"
67+
- "cargo check datafusion features"
68+
- "cargo check datafusion-functions features"
69+
- "cargo test (amd64)"
70+
- "cargo test datafusion-cli (amd64)"
71+
- "cargo examples (amd64)"
72+
- "cargo test doc (amd64)"
73+
- "cargo doc"
74+
- "build and run with wasm-pack"
75+
- "verify benchmark results (amd64)"
76+
- "Run sqllogictest with Postgres runner"
77+
- "Run sqllogictest in Substrait round-trip mode"
78+
- "cargo test (macos-aarch64)"
79+
- "Verify Vendored Code"
80+
- "Check cargo fmt"
81+
- "clippy"
82+
- "check Cargo.toml formatting"
83+
- "check configs.md and ***_functions.md is up-to-date"
84+
- "check example README is up-to-date"
85+
- "Verify MSRV (Min Supported Rust Version)"
6386
# needs to be updated as part of the release process
6487
# .asf.yaml doesn't support wildcard branch protection rules, only exact branch names
6588
# https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file#branch-protection

.github/workflows/rust.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@ on:
3333
- ".github/ISSUE_TEMPLATE/**"
3434
- ".github/pull_request_template.md"
3535
pull_request:
36-
paths-ignore:
37-
- "docs/**"
38-
- "**.md"
39-
- ".github/ISSUE_TEMPLATE/**"
40-
- ".github/pull_request_template.md"
4136
# manual trigger
4237
# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
4338
workflow_dispatch:
39+
merge_group:
40+
4441

4542
permissions:
4643
contents: read

0 commit comments

Comments
 (0)