This is an automated email from the ASF dual-hosted git repository.
gaogaotiantian pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 58653f737bc3 [SPARK-57398][4.0][INFRA] Make branch-4.0 scheduled build
workflows self-contained
58653f737bc3 is described below
commit 58653f737bc3c2fb279851f0b83fd8d96190a96d
Author: Tian Gao <[email protected]>
AuthorDate: Fri Jun 12 14:06:06 2026 -0700
[SPARK-57398][4.0][INFRA] Make branch-4.0 scheduled build workflows
self-contained
### What changes were proposed in this pull request?
This PR makes the `branch-4.0` scheduled build workflow files
self-contained, following the same approach as the `branch-4.1` work
(SPARK-57267) and SPARK-57115 (which did this for `build_java17.yml`):
- Rewrites `build_java21.yml`, `build_non_ansi.yml`, `build_maven.yml`,
`build_maven_java21.yml`, and `build_python_pypy3.10.yml` so they are triggered
by `workflow_dispatch` only (the dormant `schedule:` triggers are removed;
scheduled runs on a non-default branch never fire anyway), drop the inherited
`branch: master` (so they build `branch-4.0`), and use generic,
non-branch-tagged names.
- Adds `build_python_3.11.yml`, the equivalent of
`build_branch40_python.yml`.
The per-build configurations are relocated from the active
`build_branch40_*.yml` files on `master` so the coverage matches what
`branch-4.0` schedules today.
Notes:
- `build_and_test.yml` already defaults `branch` to `branch-4.0`, so those
callers omit `branch`. `maven_test.yml` defaulted `branch` to `master`, so its
default is bumped to `branch-4.0`; with that fixed, `build_maven.yml` /
`build_maven_java21.yml` no longer need an explicit `branch`. This also
corrects `build_maven_java21_macos15.yml`, which omits `branch` and was
likewise defaulting to master.
- A pre-existing invalid trailing comma in the non-ANSI `envs` JSON was
fixed during relocation, and `build-core-utils: false` was added to match
`build_branch40_non_ansi.yml`.
### Why are the changes needed?
This is the `branch-4.0` side of decoupling our scheduled CIs (cf. the
`branch-4.x` and `branch-4.1` efforts). Scheduled workflows only fire from the
default branch, so `branch-4.0` CI should consist of self-contained,
dispatchable workflow files on `branch-4.0` that a single scheduler on `master`
can trigger. This PR prepares those targets; a follow-up on `master` will add
the scheduler and remove the `build_branch40_*.yml` files.
### Does this PR introduce _any_ user-facing change?
No. CI only.
### How was this patch tested?
These workflows can be triggered manually via `workflow_dispatch` once
merged.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Claude Opus 4.8)
Closes #56461 from gaogaotiantian/decouple-branch40-ci.
Authored-by: Tian Gao <[email protected]>
Signed-off-by: Tian Gao <[email protected]>
---
.github/workflows/build_java21.yml | 5 +----
.github/workflows/build_maven.yml | 4 +---
.github/workflows/build_maven_java21.yml | 4 +---
.github/workflows/build_non_ansi.yml | 8 +++-----
.../{build_python_pypy3.10.yml => build_python_3.11.yml} | 9 +++------
.github/workflows/build_python_pypy3.10.yml | 5 +----
.github/workflows/maven_test.yml | 2 +-
7 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/.github/workflows/build_java21.yml
b/.github/workflows/build_java21.yml
index 51ece691f928..62da995475fd 100644
--- a/.github/workflows/build_java21.yml
+++ b/.github/workflows/build_java21.yml
@@ -17,11 +17,9 @@
# under the License.
#
-name: "Build (master, 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:
@@ -33,7 +31,6 @@ jobs:
if: github.repository == 'apache/spark'
with:
java: 21
- branch: master
hadoop: hadoop3
envs: >-
{
diff --git a/.github/workflows/build_maven.yml
b/.github/workflows/build_maven.yml
index e047390add6f..4dedac6cee8b 100644
--- a/.github/workflows/build_maven.yml
+++ b/.github/workflows/build_maven.yml
@@ -17,11 +17,9 @@
# under the License.
#
-name: "Build / Maven (master, 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 9fbc7b84383f..2a20b8ef1f40 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 (master, 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_non_ansi.yml
b/.github/workflows/build_non_ansi.yml
index 31654476ea3f..520801deb35b 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 (master, 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:
@@ -33,17 +31,17 @@ jobs:
if: github.repository == 'apache/spark'
with:
java: 17
- branch: master
hadoop: hadoop3
envs: >-
{
"PYSPARK_IMAGE_TO_TEST": "python-311",
"PYTHON_TO_TEST": "python3.11",
- "SPARK_ANSI_SQL_MODE": "false",
+ "SPARK_ANSI_SQL_MODE": "false"
}
jobs: >-
{
"build": "true",
+ "build-core-utils": "false",
"docs": "true",
"pyspark": "true",
"sparkr": "true",
diff --git a/.github/workflows/build_python_pypy3.10.yml
b/.github/workflows/build_python_3.11.yml
similarity index 86%
copy from .github/workflows/build_python_pypy3.10.yml
copy to .github/workflows/build_python_3.11.yml
index 0bd2ef03ce77..c3891cd72353 100644
--- a/.github/workflows/build_python_pypy3.10.yml
+++ b/.github/workflows/build_python_3.11.yml
@@ -17,11 +17,9 @@
# under the License.
#
-name: "Build / Python-only (master, PyPy 3.10)"
+name: "Build / Python-only (Python 3.11)"
on:
- schedule:
- - cron: '0 15 * * *'
workflow_dispatch:
jobs:
@@ -33,12 +31,11 @@ jobs:
if: github.repository == 'apache/spark'
with:
java: 17
- branch: master
hadoop: hadoop3
envs: >-
{
- "PYSPARK_IMAGE_TO_TEST": "pypy-310",
- "PYTHON_TO_TEST": "pypy3"
+ "PYSPARK_IMAGE_TO_TEST": "python-311",
+ "PYTHON_TO_TEST": "python3.11"
}
jobs: >-
{
diff --git a/.github/workflows/build_python_pypy3.10.yml
b/.github/workflows/build_python_pypy3.10.yml
index 0bd2ef03ce77..3b892240648b 100644
--- a/.github/workflows/build_python_pypy3.10.yml
+++ b/.github/workflows/build_python_pypy3.10.yml
@@ -17,11 +17,9 @@
# under the License.
#
-name: "Build / Python-only (master, PyPy 3.10)"
+name: "Build / Python-only (PyPy 3.10)"
on:
- schedule:
- - cron: '0 15 * * *'
workflow_dispatch:
jobs:
@@ -33,7 +31,6 @@ jobs:
if: github.repository == 'apache/spark'
with:
java: 17
- branch: master
hadoop: hadoop3
envs: >-
{
diff --git a/.github/workflows/maven_test.yml b/.github/workflows/maven_test.yml
index 4531da4f7a9f..67813815d43b 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.0
hadoop:
description: Hadoop version to run with. HADOOP_PROFILE environment
variable should accept it.
required: false
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
