From 79a32ad51aacd62a037747238273a7973018cc24 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Tue, 4 Aug 2026 13:21:20 +0900 Subject: [PATCH] [SPARK-58538][INFRA] Fix branch-4.3 workflow titles and default branch `branch-4.3` inherited its build workflows from `branch-4.x` when it was cut, so they are not yet prepared for the decoupled scheduler model. Apply what SPARK-58180 (#57319) did for `branch-4.2`, so a single scheduler on `master` can dispatch them: - remove the dormant `schedule:` triggers from the nine `build_*.yml` workflows, leaving `workflow_dispatch:`. Scheduled runs never fire from a non-default branch, so these crons were inert; the scheduler on `master` triggers them instead; - drop the branch token from the workflow titles, e.g. `"Build / Maven (branch-4.x, Scala 2.13, Hadoop 3, JDK 17)"` becomes `"Build / Maven (Scala 2.13, Hadoop 3, JDK 17)"`, matching the generic, non-branch-tagged names on `branch-4.2`. The old names also collided confusingly with the real `branch-4.x` runs in the Actions UI; - point the `branch` input default of both reusable workflows at this branch: `build_and_test.yml` from `branch-4.x` and `maven_test.yml` from `master`, both to `branch-4.3`, so the callers need no explicit `branch:`. The `maven_test.yml` default is the `branch-4.3` instance of SPARK-58537: the callers pass no `branch:` input, so the Maven workflows were building `master` rather than this branch. SPARK-58180 made the same `maven_test.yml` change for `branch-4.2` for the same reason. Co-authored-by: Isaac --- .github/workflows/build_and_test.yml | 2 +- .github/workflows/build_java17.yml | 4 +--- .github/workflows/build_java21.yml | 4 +--- .github/workflows/build_java25.yml | 4 +--- .github/workflows/build_maven.yml | 4 +--- .github/workflows/build_maven_java21.yml | 4 +--- .github/workflows/build_maven_java25.yml | 4 +--- .github/workflows/build_non_ansi.yml | 4 +--- .github/workflows/build_python_3.11.yml | 4 +--- .github/workflows/build_python_3.14.yml | 4 +--- .github/workflows/maven_test.yml | 2 +- 11 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index f265b64ff5cd5..a3c5cf353a473 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -30,7 +30,7 @@ on: description: Branch to run the build against required: false type: string - default: branch-4.x + default: branch-4.3 hadoop: description: Hadoop version to run with. HADOOP_PROFILE environment variable should accept it. required: false diff --git a/.github/workflows/build_java17.yml b/.github/workflows/build_java17.yml index 999771d9f1a6b..5fd003953fd8d 100644 --- a/.github/workflows/build_java17.yml +++ b/.github/workflows/build_java17.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Java17 (branch-4.x, Scala 2.13, Hadoop 3, JDK 17)" +name: "Build / Java17 (Scala 2.13, Hadoop 3, JDK 17)" on: - schedule: - - cron: '0 11 */2 * *' workflow_dispatch: jobs: diff --git a/.github/workflows/build_java21.yml b/.github/workflows/build_java21.yml index 33d60a375e60b..62da995475fd9 100644 --- a/.github/workflows/build_java21.yml +++ b/.github/workflows/build_java21.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Java21 (branch-4.x, Scala 2.13, Hadoop 3, JDK 21)" +name: "Build / Java21 (Scala 2.13, Hadoop 3, JDK 21)" on: - schedule: - - cron: '0 4 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/build_java25.yml b/.github/workflows/build_java25.yml index 60143693c367d..49f56000081fd 100644 --- a/.github/workflows/build_java25.yml +++ b/.github/workflows/build_java25.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Java25 (branch-4.x, Scala 2.13, Hadoop 3, JDK 25)" +name: "Build / Java25 (Scala 2.13, Hadoop 3, JDK 25)" on: - schedule: - - cron: '0 4 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/build_maven.yml b/.github/workflows/build_maven.yml index 3d8cd671cf5b5..4dedac6cee8b9 100644 --- a/.github/workflows/build_maven.yml +++ b/.github/workflows/build_maven.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Maven (branch-4.x, Scala 2.13, Hadoop 3, JDK 17)" +name: "Build / Maven (Scala 2.13, Hadoop 3, JDK 17)" on: - schedule: - - cron: '0 13 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/build_maven_java21.yml b/.github/workflows/build_maven_java21.yml index 2f90ccc510cbb..2a20b8ef1f405 100644 --- a/.github/workflows/build_maven_java21.yml +++ b/.github/workflows/build_maven_java21.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Maven (branch-4.x, Scala 2.13, Hadoop 3, JDK 21)" +name: "Build / Maven (Scala 2.13, Hadoop 3, JDK 21)" on: - schedule: - - cron: '0 14 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/build_maven_java25.yml b/.github/workflows/build_maven_java25.yml index d2e29d00d088b..2b04250b9577b 100644 --- a/.github/workflows/build_maven_java25.yml +++ b/.github/workflows/build_maven_java25.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Maven (branch-4.x, Scala 2.13, Hadoop 3, JDK 25)" +name: "Build / Maven (Scala 2.13, Hadoop 3, JDK 25)" on: - schedule: - - cron: '0 14 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/build_non_ansi.yml b/.github/workflows/build_non_ansi.yml index 9b83a71b170e0..0d082654c7207 100644 --- a/.github/workflows/build_non_ansi.yml +++ b/.github/workflows/build_non_ansi.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Non-ANSI (branch-4.x, Hadoop 3, JDK 17, Scala 2.13)" +name: "Build / Non-ANSI (Hadoop 3, JDK 17, Scala 2.13)" on: - schedule: - - cron: '0 1 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/build_python_3.11.yml b/.github/workflows/build_python_3.11.yml index d5d98aeb728f4..c3891cd72353a 100644 --- a/.github/workflows/build_python_3.11.yml +++ b/.github/workflows/build_python_3.11.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Python-only (branch-4.x, Python 3.11)" +name: "Build / Python-only (Python 3.11)" on: - schedule: - - cron: '0 19 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/build_python_3.14.yml b/.github/workflows/build_python_3.14.yml index 9a67a03de4aec..90c368aa0a4c2 100644 --- a/.github/workflows/build_python_3.14.yml +++ b/.github/workflows/build_python_3.14.yml @@ -17,11 +17,9 @@ # under the License. # -name: "Build / Python-only (branch-4.x, Python 3.14)" +name: "Build / Python-only (Python 3.14)" on: - schedule: - - cron: '0 21 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/maven_test.yml b/.github/workflows/maven_test.yml index a857cf048953d..91041336ddfdb 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.3 hadoop: description: Hadoop version to run with. HADOOP_PROFILE environment variable should accept it. required: false