diff --git a/.travis.yml b/.travis.yml index f8ef4e53e..39f03955c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,8 @@ install: - ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then ./docs/src/main/asciidoc/ghpages.sh; fi' script: -- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw -s .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true -P integration' -- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw install -nsu -Dmaven.test.redirectTestOutputToFile=true -P integration' -- jdk_switcher use oraclejdk8 && sh -e scripts/runAcceptanceTests.sh +- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw -s .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true -P integration && jdk_switcher use oraclejdk8 && sh -e scripts/runAcceptanceTests.sh' +- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw install -nsu -Dmaven.test.redirectTestOutputToFile=true -P integration && jdk_switcher use oraclejdk8 && sh -e scripts/runAcceptanceTests.sh' env: global: - GIT_NAME="Spencer Gibb"