inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/V3.1' into release/V3.2

Browse Source 
# Conflicts:
#	scripts/set-release-variables.sh
This commit is contained in:
ehardon
2020-12-07 17:53:42 +02:00
parent dd2e335de5
commit 3441fde97b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/set-release-variables.sh
View File

@@ -2,14 +2,14 @@
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"

4
travis/.travis.publish-stage.yml
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}"