From 060a2d11e5d7f4ce64b9d554e3cb1d705d7d1584 Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Tue, 14 Mar 2017 19:28:52 +0200 Subject: [PATCH] ci(aio): deploy previews from aio-master (#15137) --- scripts/ci/deploy.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/ci/deploy.sh b/scripts/ci/deploy.sh index f558af3789..f9aaaa149d 100755 --- a/scripts/ci/deploy.sh +++ b/scripts/ci/deploy.sh @@ -40,9 +40,9 @@ case ${CI_MODE} in travisFoldEnd "deploy.packages" ;; aio) - # Don't deploy if this build is not for master - if [[ ${TRAVIS_BRANCH} != "master" ]]; then - echo "Skipping deploy because this build is not for master." + # Don't deploy if this build is not for master or aio-master + if [[ ${TRAVIS_BRANCH} != "master" && ${TRAVIS_BRANCH} != "aio-master" ]]; then + echo "Skipping deploy because this build is not for master or aio-master." exit 0 fi @@ -76,6 +76,9 @@ case ${CI_MODE} in esac fi travisFoldEnd "deploy.aio.pr-preview" + elif [[ ${TRAVIS_BRANCH} == "aio-master" ]]; then + # This is upstream aio-master: Don't deploy to staging + echo "Skipping deploy to staging because this build is for upstream aio-master." else # This is upstream master: Deploy to staging travisFoldStart "deploy.aio.staging"