Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update
Signed-off-by: Weichen Xu <weichen.xu@databricks.com>
  • Loading branch information
WeichenXu123 committed Jun 3, 2024
commit c2f52df828001f90119a98b2cd1348148e9e11df
10 changes: 0 additions & 10 deletions .github/workflows/python-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@ jobs:
include:
- spark-version: 3.5.0
scala-version: 2.12.18
python-version: 3.9
- spark-version: 3.4.1
scala-version: 2.12.17
python-version: 3.9
- spark-version: 3.3.3
scala-version: 2.12.15
python-version: 3.9
- spark-version: 3.2.4
scala-version: 2.12.15
python-version: 3.9
runs-on: ubuntu-22.04
env:
# define Java options for both official sbt and sbt-extras
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/scala-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@ jobs:
scala-version: 2.13.8
- spark-version: 3.5.0
scala-version: 2.12.12
- spark-version: 3.4.1
scala-version: 2.13.8
- spark-version: 3.4.1
scala-version: 2.12.12
- spark-version: 3.3.3
scala-version: 2.13.8
- spark-version: 3.3.3
scala-version: 2.12.12
- spark-version: 3.2.4
scala-version: 2.13.5
- spark-version: 3.2.4
scala-version: 2.12.12
runs-on: ubuntu-22.04
env:
# fixing this error after tests success: sbt.ForkMain failed with exit code 134
Expand Down
6 changes: 0 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,15 @@

import ReleaseTransformations._

resolvers += "Spark snapshot repository" at "https://repository.apache.org/snapshots/"

val sparkVer = sys.props.getOrElse("spark.version", "3.5.0")
val sparkBranch = sparkVer.substring(0, 3)
val defaultScalaVer = sparkBranch match {
case "3.5" => "2.12.18"
case "3.4" => "2.12.17"
case "3.3" => "2.12.15"
case "3.2" => "2.12.15"
case _ => throw new IllegalArgumentException(s"Unsupported Spark version: $sparkVer.")
}
val scalaVer = sys.props.getOrElse("scala.version", defaultScalaVer)
val defaultScalaTestVer = scalaVer match {
case s if s.startsWith("2.12") || s.startsWith("2.13") => "3.0.8"
case s if s.startsWith("2.11") => "2.2.6" // scalatest_2.11 does not have 2.0 published
}

sparkVersion := sparkVer
Expand Down