Include xgboost tests in the aggregatedProjects

combust · Oct 6, 2020 · f444f21 · f444f21
1 parent 496349a
commit f444f21
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,14 +30,6 @@ jobs:
       script:
         - make test_benchmark
 
-    - name: "MLeap xgboost runtime tests"
-      script:
-        - make test_xgboost_runtime
-
-    - name: "MLeap xgboost spark tests"
-      script:
-        - make test_xgboost_spark
-
     - name: "All other sbt tests"
       script:
         - make test_root_sbt_project

diff --git a/Makefile b/Makefile
@@ -10,12 +10,6 @@ test_executor:
 test_benchmark:
 	sbt "+ mleap-benchmark/test"
 
-test_xgboost_runtime:
-	sbt "+ mleap-xgboost-runtime/test"
-
-test_xgboost_spark:
-	sbt "+ mleap-xgboost-spark/test"
-
 test_root_sbt_project:
 	sbt "+ test"
 

diff --git a/project/MleapProject.scala b/project/MleapProject.scala
@@ -12,6 +12,8 @@ object MleapProject {
     bundleHdfs,
     core,
     runtime,
+    xgboostRuntime,
+    xgboostSpark,
     avro,
     sparkBase,
     sparkTestkit,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
 
 
 libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.7.1"
diff --git a/travis/travis_publish.sh b/travis/travis_publish.sh
@@ -4,8 +4,6 @@ if [[ $TRAVIS_BRANCH == 'master' ]] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; the
   source travis/extract.sh
   source travis/docker.sh
   sbt "+ publishSigned" \
-      "+ mleap-xgboost-runtime/publishSigned" \
-      "+ mleap-xgboost-spark/publishSigned" \
       "mleap-serving/docker:publish" \
       "mleap-spring-boot/docker:publish"
 fi