diff --git a/.travis.yml b/.travis.yml index acbb3c45ce..e34aa2bcaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,8 @@ script: - git fetch origin dev - git checkout -f dev - git checkout $build_head - - git merge dev + - echo $TRAVIS_BRANCH + - git merge $TRAVIS_BRANCH - mvn integration-test -Dlogging-level=INFO #run jar sanity tests - VERSION=`echo -e 'setns x=http://maven.apache.org/POM/4.0.0\ncat /x:project/x:version/text()' | xmllint --shell pom.xml | grep -v / | tr -d -`