From f8da287fba60f17580f0ab9d4a29c740cf049c05 Mon Sep 17 00:00:00 2001 From: Davor Bonaci Date: Fri, 4 Mar 2016 17:16:36 -0800 Subject: [PATCH] Update .travis.yml Revert "mvn verify" back to "mvn install" since it breaks the following script. When we are at it, update the script to be less sensitive whether artifacts are installed. This doesn't fully fix the Travis coverage, since there's still too much logging generated in the 'verify' phase. --- .travis.yml | 3 +-- travis/test_wordcount.sh | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 973618b10696..95baf695f894 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,5 @@ install: - travis_retry mvn install clean -U -DskipTests=true script: - - travis_retry mvn versions:set -DnewVersion=manual_build - - travis_retry mvn $MAVEN_OVERRIDE verify -U + - travis_retry mvn $MAVEN_OVERRIDE install -U - travis_retry travis/test_wordcount.sh diff --git a/travis/test_wordcount.sh b/travis/test_wordcount.sh index 2e8a58b8cbe0..fdb9d10a85e6 100755 --- a/travis/test_wordcount.sh +++ b/travis/test_wordcount.sh @@ -18,7 +18,8 @@ set -e set -o pipefail PASS=1 -JAR_FILE=examples/target/google-cloud-dataflow-java-examples-all-bundled-manual_build.jar +VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[') +JAR_FILE=examples/target/google-cloud-dataflow-java-examples-all-bundled-${VERSION}.jar function check_result_hash { local name=$1