commit a1b6f072c1eae63926a239bd4dfc9dfa4f1c81b8 parent 2194dff7a49f268f66af9a9db525629087ff5215 Author: Dan Stillman <dstillman@zotero.org> Date: Fri, 19 Jan 2018 23:46:40 -0500 Run deploys from Travis on *-hotfix branches Diffstat:
| M | .travis.yml | | | 8 | ++++---- |
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml @@ -35,10 +35,10 @@ before_script: - sh -e /etc/init.d/xvfb start - npm i - npm run build - - if [ $FX_VERSION = "54.0" ] && - [ $TRAVIS_REPO_SLUG = "zotero/zotero" ] && - [ $TRAVIS_BRANCH = "master" ] && - [ $TRAVIS_PULL_REQUEST = "false" ]; then + - if [[ $FX_VERSION = "54.0" && + $TRAVIS_REPO_SLUG = "zotero/zotero" && + ($TRAVIS_BRANCH = "master" || $TRAVIS_BRANCH = *-hotfix) && + $TRAVIS_PULL_REQUEST = "false" ]]; then mkdir build-zip; cd build; zip -r ../build-zip/$TRAVIS_COMMIT.zip *;