From a780c19d66574309544f272ff6e19bc592ff406e Mon Sep 17 00:00:00 2001 From: David Edwards Date: Tue, 3 Mar 2020 15:18:55 +0000 Subject: [PATCH] Remove alternative solutions Add test comm_release version and bump release version. [trigger release] Require new commit message for company release: [trigger company release] --- .travis.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 830b71b90..f1f653ee2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,7 +107,7 @@ matrix: # Leaving blank will auto increment the env: # Must be in the format - ie. 6.3.0-repo-xxxx-x or 6.3.0-A-x - - release_version=6.3.0-repo-4735-2-12 + - release_version=6.3.0-repo-4735-2-13 - development_version=6.3.0-SNAPSHOT install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V # Fail the job if there is a docker image tag that matches the release_version (or project version in the POM if not set) @@ -115,8 +115,6 @@ matrix: script: bash ./scripts/travis/buildRelease.sh ${release_version} ${development_version} after_failure: - mvn release:rollback -DscmCommentPrefix="[maven-release-plugin][skip ci] " - # TODO: SOLUTION 1 - # Below is a potential solution for deployment of resources # Copy alfresco.war and the distribution zip to deploy_dir before_deploy: bash ./scripts/travis/prepareEngineeringRelease.sh deploy: @@ -132,22 +130,13 @@ matrix: on: all_branches: true condition: $TRAVIS_BRANCH =~ ^(master|develop|feature/REPO-4735_Add-release-stages-2)$ - # TODO: SOLUTION 2 - # Uses AWS CLI in script - # before_deploy: pip install awscli - # deploy: - # - provider: script - # script: echo "This should only run on master and develop" #./scripts/travis/engineeringReleaseDeployment.sh ${TRAVIS_BUILD_NUMBER} ${TRAVIS_BRANCH} - # on: - # all_branches: true - # condition: $TRAVIS_BRANCH =~ ^(master|develop|feature/REPO-4735_Add-release-stages-2)$ # This release stage should copy from our staging bucket to our release bucket - stage: "Company Release" # only on master branch - if: commit_message ~= /\[trigger release\]/ AND fork = false AND branch = feature/REPO-4735_Add-release-stages-2 AND commit_message !~ /\[no-release\]/ + if: commit_message ~= /\[trigger company release\]/ AND fork = false AND branch = feature/REPO-4735_Add-release-stages-2 AND commit_message !~ /\[no-release\]/ name: "Copy to S3 Release" env: - - COMM_RELEASE_VERSION= + - COMM_RELEASE_VERSION=202003-test-release install: skip # Nothing to build/install as we are just copying from S3 buckets before_deploy: pip install awscli delpoy: