Skip to content

Commit

Permalink
Update to test vs Spark 3.4, and tested Spark/Scala/Java configs (#659)
Browse files Browse the repository at this point in the history
* Update to test vs Spark 3.4, and tested Spark/Scala/Java configs
  • Loading branch information
srowen authored Aug 25, 2023
1 parent e866d32 commit 3d76b79
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Spark 3 / Java 8 / Scala 2.12
name: Spark 3.2 / Java 8 / Scala 2.12
on:
push:
branches: [master]
Expand All @@ -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'
- 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.2.4 ++2.12.15 clean mimaReportBinaryIssues test
4 changes: 2 additions & 2 deletions .github/workflows/test_spark_3_3_java_11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
- 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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Spark 3.2 / Java 11 / Scala 2.13
name: Spark 3.4 / Java 11 / Scala 2.13
on:
push:
branches: [master]
Expand All @@ -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'
- name: Build and test
run: sbt -Dspark.testVersion=3.2.3 ++2.13.8 clean mimaReportBinaryIssues test
run: sbt -Dspark.testVersion=3.4.1 ++2.13.8 clean scalastyle test:scalastyle mimaReportBinaryIssues test
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3d76b79

Please sign in to comment.