From 9efb9a2071bfe492f005fc67e9ba6a4057775d37 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 16:27:44 +0200 Subject: [PATCH 01/11] Fix publish stage credentials and release script regex --- .travis.yml | 4 ++-- scripts/set-release-variables.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 654183c30e..3de15a28aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -224,7 +224,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/community/RM/${RELEASE_VERSION}" @@ -245,7 +245,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 35013b7053..b15b3a59cb 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,15 +2,15 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 fi -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 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') echo "Release version is set to $RELEASE_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file From d6528592f21e8153fad1b50c35eaf1273898eb99 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 16:27:44 +0200 Subject: [PATCH 02/11] Fix publish stage credentials and release script regex --- .travis.yml | 4 ++-- scripts/set-release-variables.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0aae63c89a..addc8093f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -225,7 +225,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/community/RM/${RELEASE_VERSION}" @@ -246,7 +246,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 35013b7053..b15b3a59cb 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,15 +2,15 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 fi -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 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') echo "Release version is set to $RELEASE_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file From eacc9686fb8710e9a4857b1aa86dd048a77f5e9b Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 16:27:44 +0200 Subject: [PATCH 03/11] Fix publish stage credentials and release script regex --- .travis.yml | 4 ++-- scripts/set-release-variables.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1bf5571d7..fbd00613f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -224,7 +224,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/community/RM/${RELEASE_VERSION}" @@ -245,7 +245,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 35013b7053..b15b3a59cb 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,15 +2,15 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 fi -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 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') echo "Release version is set to $RELEASE_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file From 2ead6da3dbfaa7442a4f251568d69078316f20fd Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 16:27:44 +0200 Subject: [PATCH 04/11] Fix publish stage credentials and release script regex --- .travis.yml | 4 ++-- scripts/set-release-variables.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86eeac0a9f..695824b1d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -231,7 +231,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/community/RM/${RELEASE_VERSION}" @@ -252,7 +252,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 35013b7053..b15b3a59cb 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,15 +2,15 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 fi -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 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') echo "Release version is set to $RELEASE_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file From 1c244c8fffe0f3deb9d3208b2b5f9565fe043ad2 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 17:30:57 +0200 Subject: [PATCH 05/11] Updated regex for release version --- scripts/set-release-variables.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index b15b3a59cb..9d38ed7e4c 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,14 +2,14 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 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') echo "Release version is set to $RELEASE_VERSION" From 7d108c8e480009d2a5e4b2fe2f7a24c28468850f Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 16:59:00 +0200 Subject: [PATCH 06/11] Merge branch 'release/V2.7' into release/V3.0 --- scripts/set-release-variables.sh | 6 +++--- travis/.travis.publish-stage.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 35013b7053..b15b3a59cb 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,15 +2,15 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 fi -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 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') echo "Release version is set to $RELEASE_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml index fdb32962c4..dd2dea54ba 100644 --- a/travis/.travis.publish-stage.yml +++ b/travis/.travis.publish-stage.yml @@ -9,7 +9,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/community/RM/${RELEASE_VERSION}" @@ -30,7 +30,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" From e5f82603394da3b7acde973a904b9f4eba5ff66b Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 17:30:57 +0200 Subject: [PATCH 07/11] Updated regex for release version --- scripts/set-release-variables.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index b15b3a59cb..9d38ed7e4c 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,14 +2,14 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 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') echo "Release version is set to $RELEASE_VERSION" From e323717fb5904eedd4ac3d7c32122f5abb2a1295 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 16:59:00 +0200 Subject: [PATCH 08/11] Merge branch 'release/V2.7' into release/V3.0 --- scripts/set-release-variables.sh | 6 +++--- travis/.travis.publish-stage.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 35013b7053..b15b3a59cb 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,15 +2,15 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 fi -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 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') echo "Release version is set to $RELEASE_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml index fdb32962c4..dd2dea54ba 100644 --- a/travis/.travis.publish-stage.yml +++ b/travis/.travis.publish-stage.yml @@ -9,7 +9,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/community/RM/${RELEASE_VERSION}" @@ -30,7 +30,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" From ae554871fed24a7a8715dea5b7dae077a7c60af2 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 17:30:57 +0200 Subject: [PATCH 09/11] Updated regex for release version --- scripts/set-release-variables.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index b15b3a59cb..9d38ed7e4c 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,14 +2,14 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 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') echo "Release version is set to $RELEASE_VERSION" From 98d0152be87cf44e6e170aa9503f420059841b3b Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 16:59:00 +0200 Subject: [PATCH 10/11] Merge branch 'release/V2.7' into release/V3.0 --- scripts/set-release-variables.sh | 6 +++--- travis/.travis.publish-stage.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index 35013b7053..b15b3a59cb 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,15 +2,15 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 fi -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 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') echo "Release version is set to $RELEASE_VERSION" echo "Development version is set to $DEVELOPMENT_VERSION" \ No newline at end of file diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml index fdb32962c4..dd2dea54ba 100644 --- a/travis/.travis.publish-stage.yml +++ b/travis/.travis.publish-stage.yml @@ -9,7 +9,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/community/RM/${RELEASE_VERSION}" @@ -30,7 +30,7 @@ jobs: deploy: - provider: s3 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" bucket: "eu.dl.alfresco.com" upload_dir: "release/enterprise/RM/${RELEASE_VERSION}" From b9822943116a30f5484326c032e0f0c28e30dfe9 Mon Sep 17 00:00:00 2001 From: ehardon Date: Mon, 7 Dec 2020 17:30:57 +0200 Subject: [PATCH 11/11] Updated regex for release version --- scripts/set-release-variables.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh index b15b3a59cb..9d38ed7e4c 100755 --- a/scripts/set-release-variables.sh +++ b/scripts/set-release-variables.sh @@ -2,14 +2,14 @@ set -e 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 echo "The commit message is in the wrong format or it does not contain all the required properties." exit 1 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') echo "Release version is set to $RELEASE_VERSION"