diff --git a/.travis.yml b/.travis.yml index f84865a1de..fbd6878b3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,10 +45,8 @@ env: branches: only: - - master - - develop - - /.*old-env.*/ - - /.*next-release.*/ + - /^master(-patch.*)?$/ + - /^develop(-patch.*)?$/ - /.*beta.*/ stages: @@ -67,9 +65,9 @@ stages: - name: "e2e Test" if: type = pull_request || (type = cron || type = api) - name: "Release tag" - if: branch = master + if: branch =~ /^master(-patch.*)?$/ - name: "Deprecate develop builds" - if: branch = master + if: branch =~ /^master(-patch.*)?$/ addons: chrome: stable diff --git a/scripts/travis/release/release-docker.sh b/scripts/travis/release/release-docker.sh index de4bfad864..fade123c9d 100755 --- a/scripts/travis/release/release-docker.sh +++ b/scripts/travis/release/release-docker.sh @@ -14,12 +14,12 @@ echo "ℹ️ Check Docker Image release for $COMMIT_MESSAGE type $TRAVIS_EVENT_T if [[ $TRAVIS_EVENT_TYPE == "push" || $TRAVIS_EVENT_TYPE == "cron" || ( $TRAVIS_EVENT_TYPE == "pull_request" && $COMMIT_MESSAGE == *"[create docker image]"* )]]; then - if [[ $TRAVIS_BRANCH == "develop" || $TRAVIS_BRANCH == "master" ]]; + if [[ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ || $TRAVIS_BRANCH =~ ^master(-patch.*)?$ ]]; then cd $DIR/../../../ - if [[ $TRAVIS_BRANCH == "master" ]]; then + if [[ $TRAVIS_BRANCH =~ ^master(-patch.*)?$ ]]; then TAGS=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g') else if [[ "${TRAVIS_PULL_REQUEST_BRANCH}" != "" ]]; diff --git a/scripts/travis/release/release-npm.sh b/scripts/travis/release/release-npm.sh index f98f446ee3..eef85d202d 100755 --- a/scripts/travis/release/release-npm.sh +++ b/scripts/travis/release/release-npm.sh @@ -8,7 +8,7 @@ if [ $TRAVIS_EVENT_TYPE == "push" ] || [ $TRAVIS_EVENT_TYPE == "cron" ] || [ $T then TAG_NPM=latest - if [ $TRAVIS_BRANCH == "develop" ] || [ $TRAVIS_EVENT_TYPE == "cron" ] || [ $TRAVIS_EVENT_TYPE == "api" ] + if [ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ ] || [ $TRAVIS_EVENT_TYPE == "cron" ] || [ $TRAVIS_EVENT_TYPE == "api" ] then TAG_NPM=alpha fi