(datafusion) branch main updated: Prepare for Merge Queue (#17183)

[bl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

blaginin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git


The following commit(s) were added to refs/heads/main by this push:
     new 351675ddc2 Prepare for Merge Queue (#17183)
351675ddc2 is described below

commit 351675ddc27c42684a079b3a89fe2dee581d89a2
Author: Dmitrii Blaginin <dm...@blaginin.me>
AuthorDate: Wed Sep 10 22:25:56 2025 +0100

    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 <no...@anthropic.com>
    
    * Kill strict
    
    * Tagging shouldn't be required MQ stage
    
    * Branches ignore for dev
    
    ---------
    
    Co-authored-by: Claude <no...@anthropic.com>
---
 .asf.yaml                          | 31 ++++++++++++++++++++++++++++++-
 .github/workflows/audit.yml        |  6 ++++--
 .github/workflows/dependencies.yml |  3 +++
 .github/workflows/dev.yml          |  7 ++++++-
 .github/workflows/large_files.yml  | 12 +++++++++++-
 .github/workflows/rust.yml         |  3 +++
 6 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 7f59736966..48e2075527 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -50,8 +50,36 @@ github:
     main:
       required_pull_request_reviews:
         required_approving_review_count: 1
+      required_status_checks:
+        contexts:
+          - "Check License Header"
+          - "cargo doc"
+          - "build and run with wasm-pack"
+          - "linux build test"
+          - "cargo test (macos-aarch64)"
+          - "Verify Vendored Code"
+          - "Check cargo fmt"
+          - "Verify MSRV (Min Supported Rust Version)"
+          - "cargo check datafusion-common features"
+          - "cargo check datafusion-substrait features"
+          - "cargo check datafusion-proto features"
+          - "cargo check datafusion features"
+          - "cargo check datafusion-functions features"
+          - "cargo test (amd64)"
+          - "cargo examples (amd64)"
+          - "cargo test doc (amd64)"
+          - "verify benchmark results (amd64)"
+          - "Run sqllogictest with Postgres runner"
+          - "Run sqllogictest in Substrait round-trip mode"
+          - "cargo test pyarrow (amd64)"
+          - "clippy"
+          - "check Cargo.toml formatting"
+          - "Use prettier to check formatting of documents"
+          - "check-files"
+          - "cargo test datafusion-cli (amd64)"
+          - "check configs.md and ***_functions.md is up-to-date"
     # needs to be updated as part of the release process
-    # Github doesn't support wildcard branch protection rules, only exact branch names
+    # .asf.yaml doesn't support wildcard branch protection rules, only exact branch names
     # https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file#branch-protection
     # Keeping set of protected branches for future releases
     # Meanwhile creating a prerelease script that will update the branch protection names
@@ -122,6 +150,7 @@ github:
   pull_requests:
     # enable updating head branches of pull requests
     allow_update_branch: true
+    allow_auto_merge: true
 
 # publishes the content of the `asf-site` branch to
 # https://datafusion.apache.org/
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index 0610d4d37f..f1a4940595 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -23,16 +23,18 @@ concurrency:
 
 on:
   push:
+    branches:
+      - main
     paths:
       - "**/Cargo.toml"
       - "**/Cargo.lock"
-    branches:
-      - main
 
   pull_request:
     paths:
       - "**/Cargo.toml"
       - "**/Cargo.lock"
+  
+  merge_group:
 
 jobs:
   security_audit:
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index fede423a50..5857d8fdea 100644
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@@ -23,6 +23,8 @@ concurrency:
 
 on:
   push:
+    branches-ignore:
+      - 'gh-readonly-queue/**'
     paths:
       - "**/Cargo.toml"
       - "**/Cargo.lock"
@@ -30,6 +32,7 @@ on:
     paths:
       - "**/Cargo.toml"
       - "**/Cargo.lock"
+  merge_group:
   # manual trigger
   # https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
   workflow_dispatch:
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 03e1dfc7bf..97f1b4e5b2 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -16,7 +16,12 @@
 # under the License.
 
 name: Dev
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - 'gh-readonly-queue/**'
+  pull_request:
+  merge_group:
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/large_files.yml b/.github/workflows/large_files.yml
index 885fae44af..9cbfd6030a 100644
--- a/.github/workflows/large_files.yml
+++ b/.github/workflows/large_files.yml
@@ -23,6 +23,7 @@ concurrency:
 
 on:
   pull_request:
+  merge_group:
 
 jobs:
   check-files:
@@ -38,7 +39,16 @@ jobs:
           MAX_FILE_SIZE_BYTES: 1048576
         shell: bash
         run: |
-          git rev-list --objects ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} \
+          if [ "${{ github.event_name }}" = "merge_group" ]; then
+            # For merge queue, compare against the base branch
+            base_sha="${{ github.event.merge_group.base_sha }}"
+            head_sha="${{ github.event.merge_group.head_sha }}"
+          else
+            # For pull requests
+            base_sha="${{ github.event.pull_request.base.sha }}"
+            head_sha="${{ github.event.pull_request.head.sha }}"
+          fi
+          git rev-list --objects ${base_sha}..${head_sha} \
             > pull-request-objects.txt
           exit_code=0
           while read -r id path; do
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 05a6d70f02..b064df2acb 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -23,6 +23,8 @@ concurrency:
 
 on:
   push:
+    branches-ignore:
+      - 'gh-readonly-queue/**'
     paths-ignore:
       - "docs/**"
       - "**.md"
@@ -34,6 +36,7 @@ on:
       - "**.md"
       - ".github/ISSUE_TEMPLATE/**"
       - ".github/pull_request_template.md"
+  merge_group:
   # manual trigger
   # https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
   workflow_dispatch:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org