master patch (#7510)

* master patch

Signed-off-by: eromano <eugenioromano16@gmail.com>

* [skip ci]

* Update release-npm.sh

* Update release-docker.sh
This commit is contained in:
Eugenio Romano
2022-07-13 14:08:26 +02:00
committed by GitHub
parent 635e62cbd3
commit b0d4c3ae99
3 changed files with 7 additions and 9 deletions

View File

@@ -45,10 +45,8 @@ env:
branches: branches:
only: only:
- master - /^master(-patch.*)?$/
- develop - /^develop(-patch.*)?$/
- /.*old-env.*/
- /.*next-release.*/
- /.*beta.*/ - /.*beta.*/
stages: stages:
@@ -67,9 +65,9 @@ stages:
- name: "e2e Test" - name: "e2e Test"
if: type = pull_request || (type = cron || type = api) if: type = pull_request || (type = cron || type = api)
- name: "Release tag" - name: "Release tag"
if: branch = master if: branch =~ /^master(-patch.*)?$/
- name: "Deprecate develop builds" - name: "Deprecate develop builds"
if: branch = master if: branch =~ /^master(-patch.*)?$/
addons: addons:
chrome: stable chrome: stable

View File

@@ -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]"* )]]; if [[ $TRAVIS_EVENT_TYPE == "push" || $TRAVIS_EVENT_TYPE == "cron" || ( $TRAVIS_EVENT_TYPE == "pull_request" && $COMMIT_MESSAGE == *"[create docker image]"* )]];
then then
if [[ $TRAVIS_BRANCH == "develop" || $TRAVIS_BRANCH == "master" ]]; if [[ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ || $TRAVIS_BRANCH =~ ^master(-patch.*)?$ ]];
then then
cd $DIR/../../../ 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') TAGS=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g')
else else
if [[ "${TRAVIS_PULL_REQUEST_BRANCH}" != "" ]]; if [[ "${TRAVIS_PULL_REQUEST_BRANCH}" != "" ]];

View File

@@ -8,7 +8,7 @@ if [ $TRAVIS_EVENT_TYPE == "push" ] || [ $TRAVIS_EVENT_TYPE == "cron" ] || [ $T
then then
TAG_NPM=latest 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 then
TAG_NPM=alpha TAG_NPM=alpha
fi fi