aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-08 16:07:27 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-08 16:07:27 +0200
commitc3f73552b82923e8da224529895332c44bf8dace (patch)
tree8c554041f99f4c165da2e173381e527b8210058b /.travis.yml
parent4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49 (diff)
downloadmitmproxy-c3f73552b82923e8da224529895332c44bf8dace.tar.gz
mitmproxy-c3f73552b82923e8da224529895332c44bf8dace.tar.bz2
mitmproxy-c3f73552b82923e8da224529895332c44bf8dace.zip
docs: add travis integration
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index c63a52e0..8f9487f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,8 @@ matrix:
- debian-sid
packages:
- libssl-dev
- - python 2.7
- env: DOCS
+ - python: 2.7
+ env: DOCS=1
- python: pypy
- python: pypy
env: OPENSSL=1.0.2
@@ -40,7 +40,8 @@ before_script:
- "openssl version -a"
script:
- - "nosetests --with-cov --cov-report term-missing"
+ - "if [ -z \"$DOCS\" ]; then nosetests --with-cov --cov-report term-missing; fi"
+ - "if [ -n \"$DOCS\" ]; then cd docs && make html; fi"
after_success:
- coveralls
@@ -53,7 +54,7 @@ notifications:
on_failure: always
slack:
rooms:
- - mitmproxy:YaDGC9Gt9TEM7o8zkC2OLNsu
+ - mitmproxy:YaDGC9Gt9TEM7o8zkC2OLNsu
on_success: change
on_failure: always