Merge pull request #153 from YeoLab/update_doc_locations

Update where docs are uploaded to:
YeoLab · Nov 7, 2014 · 396ebaa · 396ebaa
2 parents 5e551cd + f0c0306
commit 396ebaa
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,11 +46,11 @@ after_script:
   - pip install .
   - make lint
   - sudo pip install -r doc/requirements.txt --use-mirrors
+  - RELEASE=release
   - MASTER=master
-  - DEV=dev
-  - if [[ $TRAVIS_BRANCH == "$MASTER" ]] ; then export DEPLOY_HTML_DIR=docs-stable ; fi
-  - if [[ $TRAVIS_BRANCH == "$DEV" ]] ; then export DEPLOY_HTML_DIR=docs-dev ; fi
-  - if [[ $TRAVIS_BRANCH == "$MASTER" ]] || [[ $TRAVIS_BRANCH == "$DEV" ]] ; then cd doc ; make setup_gh_pages ; make generate ; make deploy ; fi
+  - if [[ $TRAVIS_BRANCH == "*$RELEASE*" ]] ; then export DEPLOY_HTML_DIR=docs ; fi
+  - if [[ $TRAVIS_BRANCH == "$MASTER" ]] ; then export DEPLOY_HTML_DIR=docs-dev ; fi
+  - if [[ $TRAVIS_BRANCH == "*$RELEASE*" ]] || [[ $TRAVIS_BRANCH == "$MASTER" ]] ; then cd doc ; make setup_gh_pages ; make generate ; make deploy ; fi
 
 # For slack notifications
 notifications: