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

@@ -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}" != "" ]];

View File

@@ -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