Merge branch 'release/V2.7' into release/V3.0

This commit is contained in:
ehardon
2020-12-07 16:59:00 +02:00
parent 27b20f06b1
commit 165b05f71b
2 changed files with 5 additions and 5 deletions

View File

@@ -2,15 +2,15 @@
set -e set -e
echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE" echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])') release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
if [ ! -n "$release_message" ]; then if [ ! -n "$release_message" ]; then
echo "The commit message is in the wrong format or it does not contain all the required properties." echo "The commit message is in the wrong format or it does not contain all the required properties."
exit 1 exit 1
fi fi
export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1) export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT') export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
echo "Release version is set to $RELEASE_VERSION" echo "Release version is set to $RELEASE_VERSION"
echo "Development version is set to $DEVELOPMENT_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION"

View File

@@ -9,7 +9,7 @@ jobs:
deploy: deploy:
- provider: s3 - provider: s3
access_key_id: ${RELEASE_AWS_ACCESS_KEY} access_key_id: ${RELEASE_AWS_ACCESS_KEY}
secret_access_key: $RELEASE_AWS_ACCESS_SECRET} secret_access_key: ${RELEASE_AWS_SECRET_KEY}
region: "eu-west-1" region: "eu-west-1"
bucket: "eu.dl.alfresco.com" bucket: "eu.dl.alfresco.com"
upload_dir: "release/community/RM/${RELEASE_VERSION}" upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
deploy: deploy:
- provider: s3 - provider: s3
access_key_id: ${RELEASE_AWS_ACCESS_KEY} access_key_id: ${RELEASE_AWS_ACCESS_KEY}
secret_access_key: ${RELEASE_AWS_ACCESS_SECRET} secret_access_key: ${RELEASE_AWS_SECRET_KEY}
region: "eu-west-1" region: "eu-west-1"
bucket: "eu.dl.alfresco.com" bucket: "eu.dl.alfresco.com"
upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"