From 11136b6cb178ec0c06c5752a1b4946078514a438 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Tue, 4 Aug 2026 13:25:33 +0900 Subject: [PATCH] [SPARK-58537][INFRA] Make maven_test.yml default to branch-4.x on branch-4.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The scheduled Maven workflows on `branch-4.x` were building `master`, not the branch. They call the reusable `maven_test.yml` without passing a `branch` input, and that workflow declared `default: master`, which it then uses as the checkout ref. Five workflows on this branch rely on the default: `build_maven.yml`, `build_maven_java21.yml`, `build_maven_java25.yml`, `build_maven_java21_arm.yml` and `build_maven_java21_macos26.yml`. Point the default at `branch-4.x`, matching `build_and_test.yml` on this branch (already `branch-4.x`) and both reusable workflows on `branch-4.2` and `branch-4.1` (each defaulting to their own branch, which is why their callers correctly pass no input). Also retitle `build_maven_java21_arm.yml` and `build_maven_java21_macos26.yml`, which still said `master` in their names — a stale artifact of being copied from `master` (the same two are stale on `branch-4.2`). They ran against `master` only because of the default this commit fixes, so the names would otherwise become actively wrong. Callers that target another branch pass `branch:` explicitly (e.g. `build_branch41_maven.yml` passes `branch-4.1`) and are unaffected. This misreporting masked SPARK-57897, where `branch-4.x` could not load its Maven project model at all, yet the branch's Maven workflow kept reporting success. Co-authored-by: Isaac --- .github/workflows/build_maven_java21_arm.yml | 2 +- .github/workflows/build_maven_java21_macos26.yml | 2 +- .github/workflows/maven_test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_maven_java21_arm.yml b/.github/workflows/build_maven_java21_arm.yml index 16417bb1c5f22..b8b55a737120c 100644 --- a/.github/workflows/build_maven_java21_arm.yml +++ b/.github/workflows/build_maven_java21_arm.yml @@ -17,7 +17,7 @@ # under the License. # -name: "Build / Maven (master, Scala 2.13, Hadoop 3, JDK 21, ARM)" +name: "Build / Maven (branch-4.x, Scala 2.13, Hadoop 3, JDK 21, ARM)" on: schedule: diff --git a/.github/workflows/build_maven_java21_macos26.yml b/.github/workflows/build_maven_java21_macos26.yml index c858a7f70b270..d4ba178dca16c 100644 --- a/.github/workflows/build_maven_java21_macos26.yml +++ b/.github/workflows/build_maven_java21_macos26.yml @@ -17,7 +17,7 @@ # under the License. # -name: "Build / Maven (master, Scala 2.13, Hadoop 3, JDK 21, MacOS-26)" +name: "Build / Maven (branch-4.x, Scala 2.13, Hadoop 3, JDK 21, MacOS-26)" on: schedule: diff --git a/.github/workflows/maven_test.yml b/.github/workflows/maven_test.yml index a857cf048953d..fa7cdd20d6ba1 100644 --- a/.github/workflows/maven_test.yml +++ b/.github/workflows/maven_test.yml @@ -30,7 +30,7 @@ on: description: Branch to run the build against required: false type: string - default: master + default: branch-4.x hadoop: description: Hadoop version to run with. HADOOP_PROFILE environment variable should accept it. required: false