diff --git a/.travis.yml b/.travis.yml index eef4fe69c..86f14bfac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ os: - osx script: - scripts/travis.sh -sudo: required -services: - - docker # Uncomment once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed # after_success: # - bash <(curl -s https://codecov.io/bash) diff --git a/scripts/travis.sh b/scripts/travis.sh index 8cbd2ed6a..405875409 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -25,7 +25,9 @@ launchTestRepo() { } launchProxyRepos() { - ./scripts/launch-proxies.sh + if [ "$(uname)" != "Darwin" ]; then + ./scripts/launch-proxies.sh + fi } integrationTestsRequirements() { @@ -107,7 +109,13 @@ runJsTests() { } runJvmTests() { - sbt ++$SCALA_VERSION jvm/test jvm/it:test + if [ "$(uname)" == "Darwin" ]; then + IT="testsJVM/it:test" # don't run proxy-tests in particular + else + IT="jvm/it:test" + fi + + sbt ++$SCALA_VERSION jvm/test $IT } validateReadme() {