Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve build by not displaying each success test #2065

Merged
merged 6 commits into from
Dec 6, 2017
Merged
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
5 changes: 4 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ lazy val commonJsSettings = Seq(
)

lazy val commonJvmSettings = Seq(
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oDF")
testOptions in Test += {
val flag = if ((isTravisBuild in Global).value) "-oCI" else "-oDF"
Tests.Argument(TestFrameworks.ScalaTest, flag)
}
)

lazy val includeGeneratedSrc: Setting[_] = {
Expand Down
14 changes: 9 additions & 5 deletions scripts/travis-publish.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash


# Build Overview:
# The overall build is split into a number of parts
# 1. The build for coverage is performed. This:
Expand Down Expand Up @@ -28,22 +29,25 @@ fi

sbt_cmd="sbt ++$TRAVIS_SCALA_VERSION"

export COURSIER_VERBOSITY=0

core_js="$sbt_cmd validateJS"
kernel_js="$sbt_cmd validateKernelJS"
free_js="$sbt_cmd validateFreeJS"

js="$core_js && $free_js && $kernel_js"
jvm="$sbt_cmd coverage validateJVM coverageReport && codecov"

sbt ;coreJVM/publishLocal;freeJVM/publishLocal
cd scalafix
sbt tests/test
cd ..
if [[ $TRAVIS_SCALA_VERSION == *"2.12"* ]]; then
scalafix="sbt ';coreJVM/publishLocal;freeJVM/publishLocal' && cd scalafix && sbt tests/test && cd .. &&"
else
scalafix=""
fi

if [[ $JS_BUILD == "true" ]]; then
run_cmd="$js"
else
run_cmd="$jvm && $sbt_cmd $publish_cmd"
run_cmd="$scalafix $jvm && $sbt_cmd $publish_cmd"
fi

eval $run_cmd