From e195a96a7f18bd1e34f408e61fe3a0a2dd89c5a4 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 6 Apr 2016 22:38:10 +0200 Subject: [PATCH] Enable SBT scripted tests on CI --- appveyor.yml | 3 ++- project/travis.sh | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e164ab91d..48e52a3e2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,9 +17,10 @@ install: build_script: - sbt ++2.11.8 clean compile coreJVM/publishLocal - sbt ++2.10.6 clean compile + - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal # to make the scripted tests happy test_script: - sbt ++2.11.8 testsJVM/test # Would node be around for testsJS/test? - - sbt ++2.10.6 testsJVM/test + - sbt ++2.10.6 testsJVM/test plugin/scripted cache: - C:\sbt\ - C:\Users\appveyor\.ivy2 diff --git a/project/travis.sh b/project/travis.sh index 7e81bd8b2..e74211729 100755 --- a/project/travis.sh +++ b/project/travis.sh @@ -32,7 +32,15 @@ function isMasterOrDevelop() { # TODO Add coverage once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed -SBT_COMMANDS="compile test coreJVM/mimaReportBinaryIssues cache/mimaReportBinaryIssues" +SBT_COMMANDS="compile test" + +if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then + SBT_COMMANDS="$SBT_COMMANDS publishLocal" # to make the scripted tests happy + SBT_COMMANDS="$SBT_COMMANDS plugin/scripted" +fi + +SBT_COMMANDS="$SBT_COMMANDS coreJVM/mimaReportBinaryIssues cache/mimaReportBinaryIssues" + if isNotPr && publish && isMaster; then SBT_COMMANDS="$SBT_COMMANDS publish" fi