diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4773d5e66d61524dda98fcc836109f2980bd513a..dc356ea249954d4a5281f05bbffbef7156b97b0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,12 +221,8 @@ upload-and-tag-release: - export RELEASE_VERSION=$(./mvnw $MAVEN_POM_WITH_MODELS $MAVEN_CLI_OPTS $MAVEN_OPTS --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - export RELEASE_TAG="v${RELEASE_VERSION}" - echo "Version to deploy '$RELEASE_VERSION', will be tagged '$RELEASE_TAG'" - - # Find name of war file in target folder (built previously in build stage), exit if none exists - - WAR_FILE=$(find target -maxdepth 1 -type f -name "*.war" | sort -n | tail -1 | xargs basename) - - if [ -z "$WAR_FILE" ]; then echo "No war file found in target directory"; exit 1; fi - - echo "Deploy war file built in build job '$WAR_FILE'" - - "./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS deploy:deploy-file -DpomFile=pom.xml -Dfile=target/$WAR_FILE" + - "./mvnw $MAVEN_POM_WITH_MODELS $MAVEN_CLI_OPTS $MAVEN_OPTS deploy -DskipTests" + # NB! Wanted to use deploy:deploy-file with already built war file above, but this requires url to be specifically set - git tag -a $RELEASE_TAG -m "Tag release ${RELEASE_TAG}" - git push origin $RELEASE_TAG