- set the correct deploymentRepository for the release.sh

- update the release command
This commit is contained in:
ehardon
2020-10-27 08:42:08 +02:00
parent 7748cfa4f2
commit d8aed515c7
2 changed files with 11 additions and 4 deletions

View File

@@ -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

View File

@@ -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
-P${deploymentRepository} release:clean release:prepare release:perform