From d46576abcf4061e7b69bddbf147b6589e5be4d4d Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Wed, 14 Oct 2020 12:50:59 +0300
Subject: [PATCH] APPS-241: - add merge branch and comment release script to
 test the release

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7198c571c..ddb70c2a3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,11 +110,11 @@ jobs:
 
     - name: "Release"
         stage: Release and Publish
-        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\/.*/ OR branch =~ merge.*) AND type != pull_request AND commit_message =~ ^\[.*release.*\]$
         before_script:
           bash scripts/set-release-variables.sh
         script:
-          - bash scripts/release.sh ${RELEASE_TYPE}
+#          - bash scripts/release.sh ${RELEASE_TYPE}
         before_deploy:
           - bash scripts/zip-artifacts.sh ${RELEASE_TYPE}
         deploy: