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: