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

voonhous pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/master by this push:
     new ed224fda0f06 chore(ci): make Java CI merge-queue-ready (#20473)
ed224fda0f06 is described below

commit ed224fda0f0615d8e23b1506b4befc8f7a368959
Author: voonhous <[email protected]>
AuthorDate: Thu Nov 5 15:20:07 2026 +0800

    chore(ci): make Java CI merge-queue-ready (#20473)
    
    * chore(ci): run Java CI through one merge-queue-ready workflow
    
    Prepares Java CI for a GitHub merge queue (#20471, #19612). The queue
    itself is enabled later through .asf.yaml.
    
    - New ci.yml owns the triggers (pull_request, merge_group, push,
      workflow_dispatch) and calls bot.yml and java_ci_engines.yml as
      reusable workflows. Its Required Checks job reports on every PR and
      queue run, and fails unless both called workflows succeed.
    - Only push keeps the path filter: a required check must report on
      every PR, and a selector job would add a second runner wait.
    - Concurrency moves to ci.yml. Pushes are keyed by SHA so queue merge
      bursts never replace a pending master run; only PR runs cancel.
    - Codecov steps skip merge_group runs, which would file coverage under
      master for commits that may never land.
    - validate_source.yml also reports on merge_group, and never cancels
      queue runs.
    
    * chore(ci): keep Java CI as two merge-queue-ready workflows
    
    Review on #20473: one ci.yml run holding both workflows puts every
    Java CI job into a single workflow run, 18 jobs at once today and 23
    after #19892, past the ASF Actions policy limit of 20 (15
    recommended) jobs running at once per workflow.
    
    - Drop ci.yml. bot.yml and java_ci_engines.yml are top-level again,
      with the merge_group trigger, the push-only path filter and the
      SHA-keyed push concurrency that ci.yml had.
    - Each ends with its own aggregate job, "Java CI result" and
      "Java CI Engines result", which fails on any failed, cancelled or
      skipped job. Each workflow runs at most 9 jobs at once.
    - README badges point at the two workflows again.
---
 .github/workflows/README.md           |   6 +-
 .github/workflows/bot.yml             | 100 ++++++++++++++++++++++------------
 .github/workflows/java_ci_engines.yml |  72 ++++++++++++++++--------
 .github/workflows/validate_source.yml |  10 +++-
 README.md                             |   4 +-
 5 files changed, 127 insertions(+), 65 deletions(-)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index ad4360531ecd..6f687a5eb2ea 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -3,6 +3,6 @@
 When updating the pr template, you must consider if updates need to be made to 
scripts/pr_compliance.py
 
 ## What are the files in workflows?
-- bot.yml: Java CI. Spark lanes (JDK 11 on Spark 3.5, JDK 17 on Spark 4.2). 
Path-filtered at the trigger; no job depends on another. Dropped lanes are 
commented in place and marked `[CI-TRIM]`
-- java_ci_engines.yml: Java CI Engines. Flink, bundle validation and 
integration tests. Same trigger filter and layout rules as bot.yml
-- validate_source.yml: PR and Source Validation. One job, 
`validate-pr-and-source`, the only required status check: it checks the PR 
description with scripts/pr_compliance.py, runs that script's own tests, 
validates the PR title, rejects commits with a Claude co-author trailer, and 
runs the source release checks (RAT, binary files, copyright). Never 
path-filtered, because a required check must report on every PR
+- bot.yml: Java CI. Spark lanes (JDK 11 on Spark 3.5, JDK 17 on Spark 4.2). 
Runs on PRs, merge-queue groups and pushes to master, release-* and branch-0.x; 
only push runs are path-filtered. No job depends on another, except the final 
`Java CI result` job, which aggregates the rest and reports on every PR and 
merge-queue run, so it can be required once the merge queue is enabled in 
.asf.yaml. Dropped lanes are commented in place and marked `[CI-TRIM]`
+- java_ci_engines.yml: Java CI Engines. Flink, bundle validation and 
integration tests. Same triggers and layout rules as bot.yml; its aggregate job 
is `Java CI Engines result`. The two are separate workflows because the ASF 
GitHub Actions policy caps the jobs running at once in one workflow at 20, and 
a single workflow for both would exceed it
+- validate_source.yml: PR and Source Validation. One job, 
`validate-pr-and-source`, the only required status check: it checks the PR 
description with scripts/pr_compliance.py, runs that script's own tests, 
validates the PR title, rejects commits with a Claude co-author trailer, and 
runs the source release checks (RAT, binary files, copyright). Never 
path-filtered, because a required check must report on every PR. Also runs on 
merge-queue groups, where only the source release checks apply
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index dfb1aa07c448..858cc3b798b6 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -3,8 +3,10 @@ name: Java CI
 # This filter replaces the former `changes` job. That job listed the changed 
files and every test
 # job waited on it through `needs`, which made each run wait for a shared 
runner twice: once for
 # the filter, once for the tests. GitHub evaluates `paths` before creating any 
job, so the same
-# decision now costs nothing. A docs-only change creates no run of this 
workflow at all, which is
-# fine because no required status check lives here (see validate_source.yml).
+# decision now costs nothing. The filter applies to push only: pull_request 
and merge_group runs
+# must always report the aggregate check at the end of this file, and a 
required check whose
+# workflow the filter skipped never reports, so it would stay pending forever. 
A docs-only PR
+# therefore runs the full suite.
 # yml/yaml files are deliberately NOT ignored, unlike the old filter: 
docker/compose/*.yml drives
 # the integration tests, several modules keep yml test resources, and the 
workflow files themselves
 # need CI to run when they change.
@@ -32,23 +34,16 @@ on:
       - master
       - 'release-*'
       - branch-0.x
-    paths:
-      - '**'
-      # Listed explicitly so the filter does not depend on '**' matching 
dot-prefixed paths.
-      - '.github/**'
-      - '!**.bmp'
-      - '!**.gif'
-      - '!**.jpg'
-      - '!**.jpeg'
-      - '!**.md'
-      - '!**.pdf'
-      - '!**.png'
-      - '!**.svg'
-      - '!.gitignore'
+  merge_group:
+    types: [checks_requested]
 
+# A group holds one running and one pending run, and a newer pending run 
replaces the older one
+# even when cancel-in-progress is false. Pushes are therefore keyed by SHA, so 
a burst of queue
+# merges to master never replaces a pending master run. merge_group refs are 
unique per queue
+# entry and only pull_request runs cancel in progress, so queue runs are never 
cancelled.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !contains(github.ref, 'master') && 
!contains(github.ref, 'branch-0.x') && !contains(github.ref, 'release-') }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ 
github.event.pull_request.number || (github.event_name == 'push' && github.sha) 
|| github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 env:
   # The retry/timeout knobs below are maven-resolver (aether.*) properties. 
Maven 3.9 resolves
@@ -132,11 +127,14 @@ jobs:
           FLINK_PROFILE: ${{ matrix.flinkProfile }}
         run:
           mvn test -Pfunctional-tests -D"$SCALA_PROFILE" -D"$SPARK_PROFILE" 
-D"$FLINK_PROFILE" -fae -pl hudi-cli $MVN_ARGS -Djacoco.skip=false
+      # No coverage on merge-queue runs. Codecov files an upload from a 
gh-readonly-queue ref under
+      # master, for a commit that may never land, and a group that succeeds 
would upload the same
+      # commit twice: once from the queue run, once from the master push run.
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -185,10 +183,10 @@ jobs:
         run:
           mvn test -Pfunctional-tests -D"$SCALA_PROFILE" -D"$SPARK_PROFILE" 
-D"$FLINK_PROFILE" -fae -Dsurefire.failIfNoSpecifiedTests=false -pl 
hudi-utilities $MVN_ARGS -Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -276,10 +274,10 @@ jobs:
             hudi-ci \
             /bin/bash -c "MAVEN_OPTS='-Xmx4g' mvn test -Pfunctional-tests 
-D$SCALA_PROFILE -D$SPARK_PROFILE -D$FLINK_PROFILE -fae -pl $FT_MODULES 
-Dcheckstyle.skip=true -Drat.skip=true $MVN_ARGS -Djacoco.skip=false"
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -620,10 +618,10 @@ jobs:
         run:
           mvn test -Punit-tests -fae -D"$SCALA_PROFILE" -D"$SPARK_PROFILE" 
-D"$FLINK_PROFILE" -pl hudi-hadoop-mr,hudi-client/hudi-java-client $MVN_ARGS 
-Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -677,10 +675,10 @@ jobs:
         run:
           mvn test -Punit-tests -Pjava17 -D"$SCALA_PROFILE" -D"$SPARK_PROFILE" 
-DwildcardSuites=skipScalaTests $JAVA_UT_FILTER1 
-Dsurefire.failIfNoSpecifiedTests=false -pl 
"hudi-common,$SPARK_COMMON_MODULES,$SPARK_MODULES" $MVN_ARGS -Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -744,10 +742,10 @@ jobs:
         run:
           mvn test -Pfunctional-tests -Pjava17 -D"$SCALA_PROFILE" 
-D"$SPARK_PROFILE" -pl "$SPARK_COMMON_MODULES,$SPARK_MODULES" $MVN_ARGS 
-Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -805,10 +803,10 @@ jobs:
         run:
           mvn test -Pfunctional-tests-c -Pjava17 -D"$SCALA_PROFILE" 
-D"$SPARK_PROFILE" -pl "$SPARK_COMMON_MODULES,$SPARK_MODULES" $MVN_ARGS 
-Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -866,10 +864,10 @@ jobs:
         run:
           mvn test -Pfunctional-tests -Pjava17 -D"$SCALA_PROFILE" 
-D"$SPARK_PROFILE" -Dtest=skipJavaTests $SCALA_TEST_DML_FILTER 
-Dsurefire.failIfNoSpecifiedTests=false -pl 
"$SPARK_COMMON_MODULES,$SPARK_MODULES" $MVN_ARGS -Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -927,10 +925,10 @@ jobs:
         run:
           mvn test -Pfunctional-tests -Pjava17 -D"$SCALA_PROFILE" 
-D"$SPARK_PROFILE" -Dtest=skipJavaTests $SCALA_TEST_OTHERS_FILTER 
-Dsurefire.failIfNoSpecifiedTests=false -pl 
"$SPARK_COMMON_MODULES,$SPARK_MODULES" $MVN_ARGS -Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -978,3 +976,35 @@ jobs:
 #          SPARK_PROFILE: ${{ matrix.sparkProfile }}
 #        run:
 #          mvn test -Punit-tests -Djava17 -Djava.version=17 -D"$SCALA_PROFILE" 
-D"$SPARK_PROFILE" -pl hudi-examples/hudi-examples-spark $MVN_ARGS
+
+  # One stable check name per workflow for branch protection and the merge 
queue. A skipped job
+  # reports success to a required check, so this check fails on a skipped job 
just as it does on a
+  # failed or cancelled one. Each workflow has its own check rather than one 
for both, because the
+  # ASF GitHub Actions policy caps the jobs running at once in one workflow at 
20 (15 recommended),
+  # and a single run of both workflows would exceed it. Adding or resharding a 
job means adding its
+  # id to `needs` below, and nothing else.
+  java-ci-result:
+    name: Java CI result
+    runs-on: ubuntu-slim
+    if: always()
+    permissions: {}
+    needs:
+      - test-spark-client-and-hadoop-common
+      - test-utilities
+      - test-common-and-other-modules
+      - test-hudi-hadoop-mr-and-hudi-java-client
+      - test-spark-java17-java-tests-part1
+      - test-spark-java17-java-tests-part2
+      - test-spark-java17-java-tests-part3
+      - test-spark-java17-scala-dml-tests
+      - test-spark-java17-scala-other-tests
+    steps:
+      - name: Summarize job results
+        env:
+          NEEDS: ${{ toJSON(needs) }}
+        run: echo "$NEEDS"
+      - name: Fail unless every job succeeded
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 
'cancelled') || contains(needs.*.result, 'skipped')
+        run: |
+          echo "::error::Every job in Java CI must succeed. The summary step 
above lists each result."
+          exit 1
diff --git a/.github/workflows/java_ci_engines.yml 
b/.github/workflows/java_ci_engines.yml
index 753c9ef9754d..21a1ff200ebd 100644
--- a/.github/workflows/java_ci_engines.yml
+++ b/.github/workflows/java_ci_engines.yml
@@ -3,8 +3,10 @@ name: Java CI Engines
 # This filter replaces the former `changes` job. That job listed the changed 
files and every test
 # job waited on it through `needs`, which made each run wait for a shared 
runner twice: once for
 # the filter, once for the tests. GitHub evaluates `paths` before creating any 
job, so the same
-# decision now costs nothing. A docs-only change creates no run of this 
workflow at all, which is
-# fine because no required status check lives here (see validate_source.yml).
+# decision now costs nothing. The filter applies to push only: pull_request 
and merge_group runs
+# must always report the aggregate check at the end of this file, and a 
required check whose
+# workflow the filter skipped never reports, so it would stay pending forever. 
A docs-only PR
+# therefore runs the full suite.
 # yml/yaml files are deliberately NOT ignored, unlike the old filter: 
docker/compose/*.yml drives
 # the integration tests, several modules keep yml test resources, and the 
workflow files themselves
 # need CI to run when they change.
@@ -32,23 +34,16 @@ on:
       - master
       - 'release-*'
       - branch-0.x
-    paths:
-      - '**'
-      # Listed explicitly so the filter does not depend on '**' matching 
dot-prefixed paths.
-      - '.github/**'
-      - '!**.bmp'
-      - '!**.gif'
-      - '!**.jpg'
-      - '!**.jpeg'
-      - '!**.md'
-      - '!**.pdf'
-      - '!**.png'
-      - '!**.svg'
-      - '!.gitignore'
+  merge_group:
+    types: [checks_requested]
 
+# A group holds one running and one pending run, and a newer pending run 
replaces the older one
+# even when cancel-in-progress is false. Pushes are therefore keyed by SHA, so 
a burst of queue
+# merges to master never replaces a pending master run. merge_group refs are 
unique per queue
+# entry and only pull_request runs cancel in progress, so queue runs are never 
cancelled.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !contains(github.ref, 'master') && 
!contains(github.ref, 'branch-0.x') && !contains(github.ref, 'release-') }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ 
github.event.pull_request.number || (github.event_name == 'push' && github.sha) 
|| github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 env:
   # The retry/timeout knobs below are maven-resolver (aether.*) properties. 
Maven 3.9 resolves
@@ -118,11 +113,14 @@ jobs:
         run: |
           mvn clean install -T 2 -Pintegration-tests -D"$SCALA_PROFILE" 
-D"$FLINK_PROFILE" -pl hudi-flink-datasource/hudi-flink -am 
-Davro.version="$FLINK_AVRO_VERSION" -Dparquet.version="$FLINK_PARQUET_VERSION" 
-DskipTests=true $MVN_ARGS
           mvn verify -Pintegration-tests -D"$SCALA_PROFILE" -D"$FLINK_PROFILE" 
-Davro.version="$FLINK_AVRO_VERSION" -Dparquet.version="$FLINK_PARQUET_VERSION" 
$FLINK_IT_FILTER1 -pl hudi-flink-datasource/hudi-flink $MVN_ARGS 
-Djacoco.skip=false
+      # No coverage on merge-queue runs. Codecov files an upload from a 
gh-readonly-queue ref under
+      # master, for a commit that may never land, and a group that succeeds 
would upload the same
+      # commit twice: once from the queue run, once from the master push run.
       - name: Generate merged coverage report
-        if: always() && endsWith(matrix.flinkProfile, '2.2')
+        if: always() && endsWith(matrix.flinkProfile, '2.2') && 
github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always() && endsWith(matrix.flinkProfile, '2.2')
+        if: always() && endsWith(matrix.flinkProfile, '2.2') && 
github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -166,10 +164,10 @@ jobs:
           mvn clean install -T 2 -Pintegration-tests -D"$SCALA_PROFILE" 
-D"$FLINK_PROFILE" -pl hudi-flink-datasource/hudi-flink -am 
-Davro.version="$FLINK_AVRO_VERSION" -Dparquet.version="$FLINK_PARQUET_VERSION" 
-DskipTests=true $MVN_ARGS
           mvn verify -Pintegration-tests -D"$SCALA_PROFILE" -D"$FLINK_PROFILE" 
-Davro.version="$FLINK_AVRO_VERSION" -Dparquet.version="$FLINK_PARQUET_VERSION" 
$FLINK_IT_FILTER2 -pl hudi-flink-datasource/hudi-flink $MVN_ARGS 
-Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always() && endsWith(matrix.flinkProfile, '2.2')
+        if: always() && endsWith(matrix.flinkProfile, '2.2') && 
github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always() && endsWith(matrix.flinkProfile, '2.2')
+        if: always() && endsWith(matrix.flinkProfile, '2.2') && 
github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -506,10 +504,10 @@ jobs:
           rm -f $GITHUB_WORKSPACE/$SPARK_ARCHIVE
           mvn verify $SCALA_PROFILE -D"$SPARK_PROFILE" -Pintegration-tests -pl 
!hudi-flink-datasource/hudi-flink $MVN_ARGS -Djacoco.skip=false
       - name: Generate merged coverage report
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         run: ./scripts/jacoco/generate_merged_coverage_report.sh 
$GITHUB_WORKSPACE
       - name: Upload coverage to Codecov
-        if: always()
+        if: always() && github.event_name != 'merge_group'
         uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe 
# v5
         with:
           files: ./jacoco-report.xml
@@ -626,3 +624,31 @@ jobs:
 #          FLINK_PROFILE: ${{ matrix.flinkProfile }}
 #        run:
 #          mvn test -Punit-tests -Djava17 -Djava.version=17 -D"$SCALA_PROFILE" 
-D"$FLINK_PROFILE" -pl hudi-examples/hudi-examples-flink $MVN_ARGS
+
+  # One stable check name per workflow for branch protection and the merge 
queue. A skipped job
+  # reports success to a required check, so this check fails on a skipped job 
just as it does on a
+  # failed or cancelled one. Each workflow has its own check rather than one 
for both, because the
+  # ASF GitHub Actions policy caps the jobs running at once in one workflow at 
20 (15 recommended),
+  # and a single run of both workflows would exceed it. Adding or resharding a 
job means adding its
+  # id to `needs` below, and nothing else.
+  java-ci-engines-result:
+    name: Java CI Engines result
+    runs-on: ubuntu-slim
+    if: always()
+    permissions: {}
+    needs:
+      - test-flink-1
+      - test-flink-2
+      - validate-bundles
+      - validate-bundle-spark4
+      - integration-tests
+    steps:
+      - name: Summarize job results
+        env:
+          NEEDS: ${{ toJSON(needs) }}
+        run: echo "$NEEDS"
+      - name: Fail unless every job succeeded
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 
'cancelled') || contains(needs.*.result, 'skipped')
+        run: |
+          echo "::error::Every job in Java CI Engines must succeed. The 
summary step above lists each result."
+          exit 1
diff --git a/.github/workflows/validate_source.yml 
b/.github/workflows/validate_source.yml
index 3b6b92a228bc..17c4e710bcbe 100644
--- a/.github/workflows/validate_source.yml
+++ b/.github/workflows/validate_source.yml
@@ -2,7 +2,9 @@ name: PR and Source Validation
 
 # The one job here is the only required status check in .asf.yaml. A required 
check must report on
 # every PR, including docs-only ones, and a path-filtered workflow is never 
instantiated for PRs that
-# miss the filter, so this workflow is never path-filtered.
+# miss the filter, so this workflow is never path-filtered. It also reports on 
merge-queue commits:
+# there the PR metadata checks skip, because CHECK_PR_METADATA is false off 
pull_request, and the
+# source checks need no PR data.
 on:
   push:
     branches:
@@ -16,10 +18,14 @@ on:
       - master
       - 'release-*'
       - branch-0.x
+  merge_group:
+    types: [checks_requested]
 
+# Merge-queue refs (gh-readonly-queue/master/...) must never be cancelled, so 
they are excluded by
+# event rather than by relying on the ref containing the text "master".
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !contains(github.ref, 'master') && 
!contains(github.ref, 'branch-0.x') && !contains(github.ref, 'release-') }}
+  cancel-in-progress: ${{ github.event_name != 'merge_group' && 
!contains(github.ref, 'master') && !contains(github.ref, 'branch-0.x') && 
!contains(github.ref, 'release-') }}
 
 jobs:
   # The only required status check in .asf.yaml. It runs every short check (PR 
metadata, source
diff --git a/README.md b/README.md
index ea7c7cc0300c..3ee4c7cb2286 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,8 @@ to ingest, index, store, serve, transform and manage your 
data across multiple c
 
 <https://hudi.apache.org/>
 
-[![Build](https://github.com/apache/hudi/actions/workflows/bot.yml/badge.svg)](https://github.com/apache/hudi/actions/workflows/bot.yml)
-[![Engines](https://github.com/apache/hudi/actions/workflows/java_ci_engines.yml/badge.svg)](https://github.com/apache/hudi/actions/workflows/java_ci_engines.yml)
+[![Build](https://github.com/apache/hudi/actions/workflows/bot.yml/badge.svg?branch=master&event=push)](https://github.com/apache/hudi/actions/workflows/bot.yml)
+[![Engines](https://github.com/apache/hudi/actions/workflows/java_ci_engines.yml/badge.svg?branch=master&event=push)](https://github.com/apache/hudi/actions/workflows/java_ci_engines.yml)
 
[![Test](https://dev.azure.com/apachehudi/hudi-oss-ci/_apis/build/status/apachehudi-ci.hudi-mirror?branchName=master)](https://dev.azure.com/apachehudi/hudi-oss-ci/_build/latest?definitionId=5&branchName=master)
 
[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Maven 
Central](https://maven-badges.herokuapp.com/maven-central/org.apache.hudi/hudi/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.hudi%22)

Reply via email to