From 922bf1c827354a8f26d3b54240429e9348acc7c1 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Sat, 23 May 2026 08:56:32 -0600 Subject: [PATCH] ci: scope Spark SQL trigger paths to per-version shims and diff Each spark_sql_test_.yml currently triggers on `spark/src/main/**` and `dev/diffs/**`, so a change confined to one Spark version's shim or diff still fans out and runs the other versions' jobs. Tighten the path allow-list per version: - exclude unrelated `spark/src/main/spark-3.4/`, `spark-3.5/`, `spark-3.x/`, `spark-4.0/`, `spark-4.1/`, `spark-4.2/`, `spark-4.x/` directories so a 3.4-only shim edit never fires the 4.x workflows, a 4.1-only shim edit never fires the 3.x workflows, and a future `spark-4.3/` shim won't trigger any 3.x workflow either - replace `dev/diffs/**` with the single `dev/diffs/.diff` the workflow actually applies, which also stops `dev/diffs/iceberg/` edits from triggering the Spark SQL test workflows --- .github/workflows/spark_sql_test_3_4.yml | 7 ++++++- .github/workflows/spark_sql_test_3_5.yml | 14 ++++++++++++-- .github/workflows/spark_sql_test_4_0.yml | 14 ++++++++++++-- .github/workflows/spark_sql_test_4_1.yml | 7 ++++++- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/.github/workflows/spark_sql_test_3_4.yml b/.github/workflows/spark_sql_test_3_4.yml index fb196248a8..e894f0a5c1 100644 --- a/.github/workflows/spark_sql_test_3_4.yml +++ b/.github/workflows/spark_sql_test_3_4.yml @@ -35,9 +35,14 @@ on: - "common/src/main/**" - "common/pom.xml" - "spark/src/main/**" + - "!spark/src/main/spark-3.5/**" + - "!spark/src/main/spark-4.0/**" + - "!spark/src/main/spark-4.1/**" + - "!spark/src/main/spark-4.2/**" + - "!spark/src/main/spark-4.x/**" - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala" - "spark/pom.xml" - - "dev/diffs/**" + - "dev/diffs/3.4.3.diff" - "pom.xml" - "rust-toolchain.toml" - ".github/workflows/spark_sql_test_3_4.yml" diff --git a/.github/workflows/spark_sql_test_3_5.yml b/.github/workflows/spark_sql_test_3_5.yml index 28225ca5f6..0bf656d81d 100644 --- a/.github/workflows/spark_sql_test_3_5.yml +++ b/.github/workflows/spark_sql_test_3_5.yml @@ -35,9 +35,14 @@ on: - "common/src/main/**" - "common/pom.xml" - "spark/src/main/**" + - "!spark/src/main/spark-3.4/**" + - "!spark/src/main/spark-4.0/**" + - "!spark/src/main/spark-4.1/**" + - "!spark/src/main/spark-4.2/**" + - "!spark/src/main/spark-4.x/**" - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala" - "spark/pom.xml" - - "dev/diffs/**" + - "dev/diffs/3.5.8.diff" - "pom.xml" - "rust-toolchain.toml" - ".github/workflows/spark_sql_test_3_5.yml" @@ -54,9 +59,14 @@ on: - "common/src/main/**" - "common/pom.xml" - "spark/src/main/**" + - "!spark/src/main/spark-3.4/**" + - "!spark/src/main/spark-4.0/**" + - "!spark/src/main/spark-4.1/**" + - "!spark/src/main/spark-4.2/**" + - "!spark/src/main/spark-4.x/**" - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala" - "spark/pom.xml" - - "dev/diffs/**" + - "dev/diffs/3.5.8.diff" - "pom.xml" - "rust-toolchain.toml" - ".github/workflows/spark_sql_test_3_5.yml" diff --git a/.github/workflows/spark_sql_test_4_0.yml b/.github/workflows/spark_sql_test_4_0.yml index 9df8593169..d9d090ac47 100644 --- a/.github/workflows/spark_sql_test_4_0.yml +++ b/.github/workflows/spark_sql_test_4_0.yml @@ -35,9 +35,14 @@ on: - "common/src/main/**" - "common/pom.xml" - "spark/src/main/**" + - "!spark/src/main/spark-3.4/**" + - "!spark/src/main/spark-3.5/**" + - "!spark/src/main/spark-3.x/**" + - "!spark/src/main/spark-4.1/**" + - "!spark/src/main/spark-4.2/**" - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala" - "spark/pom.xml" - - "dev/diffs/**" + - "dev/diffs/4.0.2.diff" - "pom.xml" - "rust-toolchain.toml" - ".github/workflows/spark_sql_test_4_0.yml" @@ -54,9 +59,14 @@ on: - "common/src/main/**" - "common/pom.xml" - "spark/src/main/**" + - "!spark/src/main/spark-3.4/**" + - "!spark/src/main/spark-3.5/**" + - "!spark/src/main/spark-3.x/**" + - "!spark/src/main/spark-4.1/**" + - "!spark/src/main/spark-4.2/**" - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala" - "spark/pom.xml" - - "dev/diffs/**" + - "dev/diffs/4.0.2.diff" - "pom.xml" - "rust-toolchain.toml" - ".github/workflows/spark_sql_test_4_0.yml" diff --git a/.github/workflows/spark_sql_test_4_1.yml b/.github/workflows/spark_sql_test_4_1.yml index 3cbdc34469..33a6e8438c 100644 --- a/.github/workflows/spark_sql_test_4_1.yml +++ b/.github/workflows/spark_sql_test_4_1.yml @@ -35,9 +35,14 @@ on: - "common/src/main/**" - "common/pom.xml" - "spark/src/main/**" + - "!spark/src/main/spark-3.4/**" + - "!spark/src/main/spark-3.5/**" + - "!spark/src/main/spark-3.x/**" + - "!spark/src/main/spark-4.0/**" + - "!spark/src/main/spark-4.2/**" - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala" - "spark/pom.xml" - - "dev/diffs/**" + - "dev/diffs/4.1.1.diff" - "pom.xml" - "rust-toolchain.toml" - ".github/workflows/spark_sql_test_4_1.yml"