APPS-241: - address PR comments

This commit is contained in:
ehardon
2020-10-08 14:24:45 +03:00
parent d42e5854a3
commit 24d140b26a
3 changed files with 5 additions and 7 deletions

View File

@@ -111,7 +111,7 @@ jobs:
- name: "Community Release"
stage: Release
if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[.*release .*\]/
if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*community release.*\]$
before_script:
bash scripts/set-release-variables.sh
script:

View File

@@ -7,7 +7,7 @@ if [ ! -n "$release_message" ]; then
exit 0
fi
export RELEASE_VERSION=$(echo $release_message | ggrep -Po '\g<1>(\d\.)+(\d|[a-z])')
export RELEASE_VERSION=$(echo $release_message | ggrep -Po '\g<1>(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}')
export DEVELOPMENT_VERSION=$(echo $release_message | ggrep -Po '(\d\.)+\d-SNAPSHOT')
echo "Release version is set to $RELEASE_VERSION"
@@ -20,7 +20,7 @@ if [[ $release_type =~ "community" ]]; then
if [[ $release_type =~ "internal" ]]; then
echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release"
export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging"
export ARTIFACTS_UPLOAD_DIR="community/alfresco-governance-services/release/${TRAVIS_BRANCH}"
export ARTIFACTS_UPLOAD_DIR="community/RM/${RELEASE_VERSION}"
else
echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release"
export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com"
@@ -31,7 +31,7 @@ elif [[ $release_type =~ "enterprise" ]]; then
if [[ $release_type =~ "internal" ]]; then
echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release"
export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging"
export ARTIFACTS_UPLOAD_DIR="enterprise/alfresco-governance-services/release/${TRAVIS_BRANCH}"
export ARTIFACTS_UPLOAD_DIR="enterprise/RM/${RELEASE_VERSION}"
else
echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release"
export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com"

View File

@@ -4,5 +4,3 @@ env:
- AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api
- AUTOMATION_UI_PATH=rm-automation/rm-automation-ui
- S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin
- GIT_COMMITTER_NAME=alfresco-build
- GIT_COMMITTER_EMAIL=info@alfresco.com