From d8aed515c78cc35c15528bfa031abe1622cc151f Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 27 Oct 2020 08:42:08 +0200 Subject: [PATCH] - set the correct deploymentRepository for the release.sh - update the release command --- .travis.yml | 5 ++--- scripts/release.sh | 10 +++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8ee4ff1cc..5ccfec6d76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -237,7 +237,6 @@ jobs: if: commit_message =~ /\[enterprise release .*\]/ before_script: - source scripts/set-release-variables.sh - - bash scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-enterprise" script: - bash scripts/release.sh "enterprise" before_deploy: @@ -262,7 +261,7 @@ jobs: stage: Publish if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/ before_script: source scripts/set-release-variables.sh - script: skip + script: travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -PbuildDockerImage -Prelease-community before_deploy: bash scripts/zip-artifacts-release.sh "community" deploy: - provider: s3 @@ -283,7 +282,7 @@ jobs: stage: Publish if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/ before_script: source scripts/set-release-variables.sh - script: skip + script: travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -PbuildDockerImage -Prelease-enterprise before_deploy: bash scripts/zip-artifacts-release.sh "enterprise" deploy: - provider: s3 diff --git a/scripts/release.sh b/scripts/release.sh index e49e7bc202..ea5ee113de 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -17,6 +17,14 @@ elif [ $release_type != "community" -a $release_type != "enterprise" ]; then exit 1 fi +# Check if it's a hotfix version by counting the number of dots in the version number. +if [ `echo "${RELEASE_VERSION}" | grep -o "\." | wc -l` == 3 -a ${release_type} == "enterprise" ]; +then + deploymentRepository="hotfix-release" +else + deploymentRepository="${release_type}-release" +fi + if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then echo "Please provide a Release and Development verison" exit 1 @@ -29,4 +37,4 @@ mvn --batch-mode \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ -DskipTests -D${release_type} -DuseReleaseProfile=false \ - -P${release_type}-release release:clean release:prepare release:perform \ No newline at end of file + -P${deploymentRepository} release:clean release:prepare release:perform \ No newline at end of file