diff --git a/.travis.yml b/.travis.yml index 765bbd707..3ac419fa7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: java jdk: - oraclejdk8 + cache: directories: - $HOME/.m2 @@ -11,15 +12,18 @@ branches: - master - /^release-.+$/ - /^dev-.+/ + before_install: + - nvm install 7 - CHROMIUM_BUILD=466537 - mkdir -p $HOME/.chromium_dist/ - wget -nc https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F$CHROMIUM_BUILD%2Fchrome-linux.zip?alt=media -O $HOME/.chromium_dist/chromium-$CHROMIUM_BUILD.zip - - unzip $HOME/.chromium_dist/chromium-$CHROMIUM_BUILD.zip + - unzip -q $HOME/.chromium_dist/chromium-$CHROMIUM_BUILD.zip - OLD_VERSION=`mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -Ev "(^\[|Download\w+:)"` - NEW_VERSION=${OLD_VERSION%-SNAPSHOT}-dev-`printf %d $TRAVIS_BUILD_NUMBER` - echo "Building version $NEW_VERSION" - mvn versions:set -DnewVersion=$NEW_VERSION + install: - mvn install -Dteavm.build.all=false -P with-idea -DskipTests=true -Dmaven.javadoc.skip=true -B -V - pushd tests/src/test/js @@ -27,8 +31,9 @@ install: - npm install - npm run build - popd + script: - - mvn -e test -P noHtmlUnit + - mvn -e test -P \!htmlUnit - BASE_PATH=`pwd` - pushd tests/src/test/js - chrome-linux/chrome --headless --remote-debugging-port=9222 --disable-gpu about:blank & @@ -37,6 +42,7 @@ script: - node start.js $BASE_PATH/html4j/target/js-tests - kill $CHROME_PID - popd + after_success: > if [[ "${TRAVIS_PULL_REQUEST:-unknown}" == "false" && $TRAVIS_BRANCH == dev-* ]] ; then export NEW_VERSION diff --git a/html4j/pom.xml b/html4j/pom.xml index 2d9bc4888..617d7477c 100644 --- a/html4j/pom.xml +++ b/html4j/pom.xml @@ -88,23 +88,20 @@ ../checkstyle.xml + + + org.apache.maven.plugins + maven-surefire-plugin + 2.16 + + + ${project.build.directory}/js-tests + true + true + + -Xmx512m + + - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - ${project.build.directory}/js-tests - true - true - - -Xmx512m - - - - diff --git a/pom.xml b/pom.xml index f653a2187..0267c3b8b 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ - noHtmlUnit + htmlUnit true @@ -302,10 +302,7 @@ 2.16 - ${project.build.directory}/js-tests htmlunit - true - true