Really run Travis tests in Mac env

The sudo:required seems to make it switch to Linux
This commit is contained in:
Alexandre Archambault 2017-06-05 18:57:29 +02:00
parent 69ffdeb553
commit dbd602d5a8
2 changed files with 10 additions and 5 deletions

View File

@ -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)

View File

@ -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() {