This is an automated email from the ASF dual-hosted git repository.
gaogaotiantian pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.2 by this push:
new 0e25e4034877 [SPARK-58180][4.2][INFRA] Prepare branch-4.2 build
workflows for decoupling
0e25e4034877 is described below
commit 0e25e40348772702b621a8664482510c17e99812
Author: Tian Gao <[email protected]>
AuthorDate: Tue Jul 21 12:01:30 2026 -0700
[SPARK-58180][4.2][INFRA] Prepare branch-4.2 build workflows for decoupling
### What changes were proposed in this pull request?
This PR makes the remaining `branch-4.2` 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_java25.yml`, `build_maven.yml`,
`build_maven_java21.yml`, `build_non_ansi.yml`, `build_python_3.11.yml`, and
`build_python_3.14.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.2`), and use generic, non-branch-tagged names.
The per-build configurations are relocated from the active
`build_branch42_*.yml` files on `master` so the coverage matches what
`branch-4.2` schedules today.
Notes:
- `build_and_test.yml` defaults `branch` to `branch-4.2`, so those callers
omit `branch`. `maven_test.yml` defaulted `branch` to `master`, so this PR
bumps that default to `branch-4.2` (matching `build_and_test.yml`); with the
default fixed, `build_maven.yml` / `build_maven_java21.yml` no longer need an
explicit `branch: branch-4.2`.
- `build_non_ansi.yml` picks up the `branch-4.2` config from
`build_branch42_non_ansi.yml` (Python 3.11 image, no bloom-filter env,
`build-core-utils: false`, no `pyspark-pandas`). A pre-existing invalid
trailing comma in the non-ANSI `envs` JSON was fixed during relocation.
- `build_java17.yml` is already self-contained (SPARK-57115) and is left
unchanged.
### Why are the changes needed?
This is the `branch-4.2` side of decoupling our scheduled CIs (cf. the
`branch-4.1` and `branch-4.x` efforts). Scheduled workflows only fire from the
default branch, so `branch-4.2` CI should consist of self-contained,
dispatchable workflow files on `branch-4.2` 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_branch42_*.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 #57319 from gaogaotiantian/decouple-branch42-ci.
Authored-by: Tian Gao <[email protected]>
Signed-off-by: Tian Gao <[email protected]>
---
.github/workflows/build_java21.yml | 5 +----
.github/workflows/build_java25.yml | 5 +----
.github/workflows/build_maven.yml | 4 +---
.github/workflows/build_maven_java21.yml | 4 +---
.github/workflows/build_non_ansi.yml | 14 +++++---------
.github/workflows/build_python_3.11.yml | 5 +----
.github/workflows/build_python_3.14.yml | 5 +----
.github/workflows/maven_test.yml | 2 +-
8 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/build_java21.yml
b/.github/workflows/build_java21.yml
index c9a6ed270546..62da995475fd 100644
--- a/.github/workflows/build_java21.yml
+++ b/.github/workflows/build_java21.yml
@@ -17,11 +17,9 @@
# under the License.
#
-name: "Build / Java21 (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_java25.yml
b/.github/workflows/build_java25.yml
index 195fad5315ad..49f56000081f 100644
--- a/.github/workflows/build_java25.yml
+++ b/.github/workflows/build_java25.yml
@@ -17,11 +17,9 @@
# under the License.
#
-name: "Build / Java25 (master, 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:
@@ -33,7 +31,6 @@ jobs:
if: github.repository == 'apache/spark'
with:
java: 25
- 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 606c724aba97..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,21 +31,19 @@ jobs:
if: github.repository == 'apache/spark'
with:
java: 17
- branch: master
hadoop: hadoop3
envs: >-
{
- "PYSPARK_IMAGE_TO_TEST": "python-312",
- "PYTHON_TO_TEST": "python3.12",
- "SPARK_ANSI_SQL_MODE": "false",
- "SPARK_TEST_SPARK_BLOOM_FILTER_SUITE_ENABLED": "true"
+ "PYSPARK_IMAGE_TO_TEST": "python-311",
+ "PYTHON_TO_TEST": "python3.11",
+ "SPARK_ANSI_SQL_MODE": "false"
}
jobs: >-
{
"build": "true",
+ "build-core-utils": "false",
"docs": "true",
"pyspark": "true",
- "pyspark-pandas": "true",
"sparkr": "true",
"tpcds-1g": "true",
"docker-integration-tests": "true",
diff --git a/.github/workflows/build_python_3.11.yml
b/.github/workflows/build_python_3.11.yml
index d9cf8ba2af91..c3891cd72353 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 (master, Python 3.11)"
+name: "Build / Python-only (Python 3.11)"
on:
- schedule:
- - cron: '0 19 * * *'
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/build_python_3.14.yml
b/.github/workflows/build_python_3.14.yml
index 45ea43f1d491..90c368aa0a4c 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 (master, Python 3.14)"
+name: "Build / Python-only (Python 3.14)"
on:
- schedule:
- - cron: '0 21 * * *'
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 99054aa6fa43..befe18af320c 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.2
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]
