From 1a832a4e0d04549c750c4e717a0c8bcddc08af8d Mon Sep 17 00:00:00 2001 From: Enrico Minack Date: Mon, 17 Mar 2025 07:33:08 +0100 Subject: [PATCH 1/3] Add Spark 3.4 and 4.0 to CI Signed-off-by: Enrico Minack --- .github/workflows/ci.yaml | 26 ++++++++++++++++---------- src/main/scala-spark-3.4 | 1 + src/main/scala-spark-4.0 | 1 + 3 files changed, 18 insertions(+), 10 deletions(-) create mode 120000 src/main/scala-spark-3.4 create mode 120000 src/main/scala-spark-4.0 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d07ccab0..e9636d07 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,17 +21,23 @@ jobs: fail-fast: false matrix: include: - - scala_version: "2.12.15" - spark_version: "3.3.4" - - scala_version: "2.12.18" - spark_version: "3.5.5" + - spark_version: "3.3.4" + scala_version: "2.12.15" + - spark_version: "3.4.4" + scala_version: "2.12.17" + - spark_version: "3.5.5" + scala_version: "2.12.18" - - scala_version: "2.13.8" - spark_version: "3.3.4" - - scala_version: "2.13.8" - spark_version: "3.5.5" - - scala_version: "2.13.8" - spark_version: "4.1.0-SNAPSHOT" + - spark_version: "3.3.4" + scala_version: "2.13.8" + - spark_version: "3.4.4" + scala_version: "2.13.8" + - spark_version: "3.5.5" + scala_version: "2.13.8" + - spark_version: "4.0.1-SNAPSHOT" + scala_version: "2.13.8" + - spark_version: "4.1.0-SNAPSHOT" + scala_version: "2.13.8" steps: - name: Checkout diff --git a/src/main/scala-spark-3.4 b/src/main/scala-spark-3.4 new file mode 120000 index 00000000..fe4fdf45 --- /dev/null +++ b/src/main/scala-spark-3.4 @@ -0,0 +1 @@ +scala-spark-3.3 \ No newline at end of file diff --git a/src/main/scala-spark-4.0 b/src/main/scala-spark-4.0 new file mode 120000 index 00000000..1aabbdfb --- /dev/null +++ b/src/main/scala-spark-4.0 @@ -0,0 +1 @@ +scala-spark-4.1 \ No newline at end of file From 2d9d5ddec5b882f4852166b6d70299f91bfa30ab Mon Sep 17 00:00:00 2001 From: Enrico Minack Date: Mon, 17 Mar 2025 07:47:20 +0100 Subject: [PATCH 2/3] Move scala-spark-3.5 to scala-spark-3.4 Signed-off-by: Enrico Minack --- src/main/scala-spark-3.4 | 1 - .../org/apache/spark/deploy/SparkSubmit.scala | 0 src/main/scala-spark-3.5 | 1 + 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 src/main/scala-spark-3.4 rename src/main/{scala-spark-3.5 => scala-spark-3.4}/org/apache/spark/deploy/SparkSubmit.scala (100%) create mode 120000 src/main/scala-spark-3.5 diff --git a/src/main/scala-spark-3.4 b/src/main/scala-spark-3.4 deleted file mode 120000 index fe4fdf45..00000000 --- a/src/main/scala-spark-3.4 +++ /dev/null @@ -1 +0,0 @@ -scala-spark-3.3 \ No newline at end of file diff --git a/src/main/scala-spark-3.5/org/apache/spark/deploy/SparkSubmit.scala b/src/main/scala-spark-3.4/org/apache/spark/deploy/SparkSubmit.scala similarity index 100% rename from src/main/scala-spark-3.5/org/apache/spark/deploy/SparkSubmit.scala rename to src/main/scala-spark-3.4/org/apache/spark/deploy/SparkSubmit.scala diff --git a/src/main/scala-spark-3.5 b/src/main/scala-spark-3.5 new file mode 120000 index 00000000..2252f2fd --- /dev/null +++ b/src/main/scala-spark-3.5 @@ -0,0 +1 @@ +scala-spark-3.4 \ No newline at end of file From 4e38517aaa644a13fa642738fbee31b221ddf6b2 Mon Sep 17 00:00:00 2001 From: Enrico Minack Date: Mon, 17 Mar 2025 07:51:49 +0100 Subject: [PATCH 3/3] Move scala-spark-4.1 to scala-spark-4.0 Signed-off-by: Enrico Minack --- src/main/scala-spark-4.0 | 1 - .../org/apache/spark/deploy/SparkSubmit.scala | 0 src/main/scala-spark-4.1 | 1 + 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 src/main/scala-spark-4.0 rename src/main/{scala-spark-4.1 => scala-spark-4.0}/org/apache/spark/deploy/SparkSubmit.scala (100%) create mode 120000 src/main/scala-spark-4.1 diff --git a/src/main/scala-spark-4.0 b/src/main/scala-spark-4.0 deleted file mode 120000 index 1aabbdfb..00000000 --- a/src/main/scala-spark-4.0 +++ /dev/null @@ -1 +0,0 @@ -scala-spark-4.1 \ No newline at end of file diff --git a/src/main/scala-spark-4.1/org/apache/spark/deploy/SparkSubmit.scala b/src/main/scala-spark-4.0/org/apache/spark/deploy/SparkSubmit.scala similarity index 100% rename from src/main/scala-spark-4.1/org/apache/spark/deploy/SparkSubmit.scala rename to src/main/scala-spark-4.0/org/apache/spark/deploy/SparkSubmit.scala diff --git a/src/main/scala-spark-4.1 b/src/main/scala-spark-4.1 new file mode 120000 index 00000000..1d475da6 --- /dev/null +++ b/src/main/scala-spark-4.1 @@ -0,0 +1 @@ +scala-spark-4.0 \ No newline at end of file