Skip to content

Commit

Permalink
try to run with travis ci
Browse files Browse the repository at this point in the history
  • Loading branch information
root authored and lao605 committed Sep 24, 2015
1 parent 2395d67 commit 39e03e6
Show file tree
Hide file tree
Showing 74 changed files with 7 additions and 10,461 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ addons:
# any part of kobo that would actively use koji, se we just delete the
# offending import.
install:
- git config --global user.name "lao605"
- git config --global user.name "Travis CI"
- git config --global user.email "your-friends@teracy.com"
- export REPO_URL_GITHUB="https://$GH_TOKEN@github.com/$GH_REPO.git"
- pip install -U pip wheel coveralls
- pip install -r requirements/devel.txt
Expand All @@ -21,13 +22,13 @@ script:
- coverage run --parallel-mode --source=contrib,pdc --omit='*tests.py,*/migrations/*,pdc/settings*' manage.py test --settings pdc.settings_test contrib pdc
- make flake8
- coverage run --parallel-mode --source=pdc_client client_test_run.py
after_success:
- coverage combine
- coveralls
- cd docs
- make setup_gh_pages
- make generate
- make deploy

This comment has been minimized.

Copy link
@lubomir

lubomir Sep 24, 2015

Member

I think changing this to if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then make deploy; fi should make it to always build the docs, but only deploy it if it was a direct push to master.

after_success:
- coverage combine
- coveralls
cache:
directories:
- $HOME/.cache/pip
Expand Down
4 changes: 0 additions & 4 deletions docs/.deploy_heroku/Gemfile

This file was deleted.

17 changes: 0 additions & 17 deletions docs/.deploy_heroku/Gemfile.lock

This file was deleted.

25 changes: 0 additions & 25 deletions docs/.deploy_heroku/config.ru

This file was deleted.

8 changes: 0 additions & 8 deletions docs/.deploy_heroku/public/404.html

This file was deleted.

1 change: 0 additions & 1 deletion docs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# default ignored by sphinx-deployment
_deploy
_deploy_heroku
19 changes: 0 additions & 19 deletions docs/.travis.yml

This file was deleted.

13 changes: 0 additions & 13 deletions docs/.travis/setup.sh

This file was deleted.

52 changes: 0 additions & 52 deletions docs/CHANGELOG_sphinx_deployment.md

This file was deleted.

Loading

0 comments on commit 39e03e6

Please sign in to comment.