Update to test vs Spark 3.4, and tested Spark/Scala/Java configs

databricks · Aug 25, 2023 · a822319 · a822319
1 parent e866d32
commit a822319
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/test_spark_3_2_java_11.yml → .github/workflows/test_spark_3_2_java_8.yml b/.github/workflows/test_spark_3_2_java_11.yml → .github/workflows/test_spark_3_2_java_8.yml
@@ -8,10 +8,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Java, SBT
         uses: olafurpg/setup-scala@v11
         with:
-          java-version: 'adopt@1.11'
+          java-version: 'adopt@1.8'
       - name: Build and test
-        run: sbt -Dspark.testVersion=3.2.3 ++2.13.8 clean mimaReportBinaryIssues test
+        run: sbt -Dspark.testVersion=3.2.4 ++2.12.15 clean mimaReportBinaryIssues test
diff --git a/.github/workflows/test_spark_3_3_java_11.yml b/.github/workflows/test_spark_3_3_java_11.yml
@@ -8,10 +8,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Java, SBT
         uses: olafurpg/setup-scala@v11
         with:
           java-version: '[email protected]'
       - name: Build and test
-        run: sbt -Dspark.testVersion=3.3.1 ++2.13.8 clean mimaReportBinaryIssues test
+        run: sbt -Dspark.testVersion=3.3.3 ++2.13.8 clean mimaReportBinaryIssues test
diff --git a/.github/workflows/test_spark_3_1_java_8.yml → .github/workflows/test_spark_3_4_java_11.yml b/.github/workflows/test_spark_3_1_java_8.yml → .github/workflows/test_spark_3_4_java_11.yml
@@ -1,4 +1,4 @@
-name: Spark 3 / Java 8 / Scala 2.12
+name: Spark 3.4 / Java 17 / Scala 2.13
 on:
   push:
     branches: [master]
@@ -8,10 +8,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Java, SBT
         uses: olafurpg/setup-scala@v11
         with:
-          java-version: 'adopt@1.8'
+          java-version: 'adopt@1.17'
       - name: Build and test
-        run: sbt -Dspark.testVersion=3.1.3 ++2.12.15 clean scalastyle test:scalastyle mimaReportBinaryIssues test
+        run: sbt -Dspark.testVersion=3.4.1 ++2.13.8 clean scalastyle test:scalastyle mimaReportBinaryIssues test
diff --git a/build.sbt b/build.sbt
@@ -6,13 +6,13 @@ version := "0.16.0"
 
 organization := "com.databricks"
 
-scalaVersion := "2.12.15"
+scalaVersion := "2.13.8"
 
 crossScalaVersions := Seq("2.12.15", "2.13.8")
 
 scalacOptions := Seq("-unchecked", "-deprecation")
 
-val sparkVersion = sys.props.get("spark.testVersion").getOrElse("3.3.1")
+val sparkVersion = sys.props.get("spark.testVersion").getOrElse("3.4.1")
 
 // To avoid packaging it, it's Provided below
 autoScalaLibrary := false