diff --git a/.travis.yml b/.travis.yml index 6d230de7a..be4dbe7a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,7 @@ install: "/bin/true" script: - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH" -- if [ ! -z "${TRAVIS_TAG}" ]; then mvn versions:set -DnewVersion=${TRAVIS_TAG}; fi -- mvn clean install -q +- if [ ! -z "${TRAVIS_TAG}" ]; then mvn versions:set -DnewVersion=${TRAVIS_TAG} clean install; else mvn clean install -q; fi cache: directories: - "$HOME/.m2" diff --git a/scripts/deploy-webgoat.sh b/scripts/deploy-webgoat.sh index 0308640bb..c62fa0674 100644 --- a/scripts/deploy-webgoat.sh +++ b/scripts/deploy-webgoat.sh @@ -4,6 +4,7 @@ docker login -u $DOCKER_USER -p $DOCKER_PASS export REPO=webgoat/webgoat-8.0 cd webgoat-server +ls target/ if [ "${BRANCH}" == "master" ] && [ ! -z "${TRAVIS_TAG}" ]; then # If we push a tag to master this will update the LATEST Docker image and tag with the version number