Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
22 changes: 22 additions & 0 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -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




2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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 :=
<scm>
<url>https://github.com/metamx/druid-spark-batch.git</url>
<connection>scm:git:[email protected]:metamx/druid-spark-batch.git</connection>
Expand All @@ -159,9 +159,9 @@ pomExtra := (
<organizationUrl>https://www.metamarkets.com</organizationUrl>
</developer>
</developers>
)


testOptions += Tests.Argument(TestFrameworks.JUnit, "-Duser.timezone=UTC")
// WTF SBT?
javaOptions in Test += "-Duser.timezone=UTC"
fork in Test := true
fork in Test := false
1 change: 1 addition & 0 deletions project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
#

sbt.version = 0.13.8
#sbt.version = 1.5.5
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.12.1.1-SNAPSHOT"
version in ThisBuild := "0.12.3"