diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml new file mode 100644 index 0000000..5c66e28 --- /dev/null +++ b/.github/workflows/scala.yml @@ -0,0 +1,22 @@ +name: Scala CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Run Test + run: sbt test diff --git a/.travis.yml b/.travis.yml index 279cf79..3785617 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,20 @@ language: scala +after_success: + - bash <(curl -s https://codecov.io/bash) scala: - 2.10.6 - 2.11.12 script: - - sbt ++$TRAVIS_SCALA_VERSION test + - sbt clean coverage test coverageReport sudo: false cache: directories: - $HOME/.m2 + + + + diff --git a/README.md b/README.md index 1172cf3..5071977 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/metamx/druid-spark-batch.svg?branch=master)](https://travis-ci.org/metamx/druid-spark-batch) +[![AppVeyor Build](https://img.shields.io/appveyor/build/averma111/druid-spark-batch?style=plastic)](https://ci.appveyor.com/project/averma111/druid-spark-batch) # druid-spark-batch Druid indexing plugin for using Spark in batch jobs diff --git a/build.sbt b/build.sbt index d2691f9..c2ea4ae 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ homepage := Some(url("https://github.com/metamx/druid-spark-batch")) crossScalaVersions := Seq("2.11.12", "2.10.6") releaseIgnoreUntrackedFiles := true -val druid_version = "0.12.1-rc3-SNAPSHOT" +val druid_version = "0.12.3" // This is just used here for Path, so anything that doesn't break spark should be fine val hadoop_version = "2.7.3" val spark_version = "2.1.0" @@ -120,9 +120,9 @@ assemblyMergeStrategy in assembly := { xs map { _.toLowerCase } match { - case ("manifest.mf" :: Nil) | ("index.list" :: Nil) | ("dependencies" :: Nil) => + case "manifest.mf" :: Nil | "index.list" :: Nil | "dependencies" :: Nil => MergeStrategy.discard - case ps@(x :: xs) if ps.last.endsWith(".sf") || ps.last.endsWith(".dsa") => + case ps@ x :: xs if ps.last.endsWith(".sf") || ps.last.endsWith(".dsa") => MergeStrategy.discard case "services" :: xs => MergeStrategy.filterDistinctLines @@ -142,11 +142,11 @@ resolvers += "JitPack.IO" at "https://jitpack.io" publishMavenStyle := true -//TODO: remove this before moving to druid.io -publishTo := Some("central-local" at "https://metamx.artifactoryonline.com/metamx/libs-releases-local") -pomIncludeRepository := { _ => false } +////: remove this before moving to druid.io +//publishTo := Some("central-local" at "https://metamx.artifactoryonline.com/metamx/libs-releases-local") +//pomIncludeRepository := { _ => false } -pomExtra := ( +pomExtra := https://github.com/metamx/druid-spark-batch.git scm:git:git@github.com:metamx/druid-spark-batch.git @@ -159,9 +159,9 @@ pomExtra := ( https://www.metamarkets.com - ) + testOptions += Tests.Argument(TestFrameworks.JUnit, "-Duser.timezone=UTC") // WTF SBT? javaOptions in Test += "-Duser.timezone=UTC" -fork in Test := true +fork in Test := false diff --git a/project/build.properties b/project/build.properties index 36183c0..0421f6a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -18,3 +18,4 @@ # sbt.version = 0.13.8 +#sbt.version = 1.5.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 652b260..e4cb50a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,3 +4,4 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") diff --git a/version.sbt b/version.sbt index 36bece2..0aa7b79 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.12.1.1-SNAPSHOT" +version in ThisBuild := "0.12.3"