diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-11-28 00:51:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 00:51:52 +0100 |
| commit | 3154dc87fd88fb9b4a7db3e2752ec7e6d6cbd303 (patch) | |
| tree | d7aeaa2e1dd14f2f360faf90cb34c5273a338569 /.travis.yml | |
| parent | 568f40c810f4de60f10bd814608fde8268ef7733 (diff) | |
| download | mitmproxy-3154dc87fd88fb9b4a7db3e2752ec7e6d6cbd303.tar.gz mitmproxy-3154dc87fd88fb9b4a7db3e2752ec7e6d6cbd303.tar.bz2 mitmproxy-3154dc87fd88fb9b4a7db3e2752ec7e6d6cbd303.zip | |
fix pyinstaller
amongst other things, fix #1746
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 11e2832a..0df32899 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,18 +51,21 @@ install: fi - pip install tox -script: tox -- --cov mitmproxy --cov pathod -v +script: + - | + tox -- --cov mitmproxy --cov pathod -v + if [[ $BDIST == "1" ]] + then + git fetch --unshallow --tags + tox -e rtool -- bdist + fi after_success: + # we build binaries on every run, but we only upload them for master snapshots or tags. - | - if [[ $BDIST == "1" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]] + if [[ $BDIST == "1" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "pyinstaller" || $TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]] then - git fetch --unshallow - ./dev.sh 3.5 - source venv3.5/bin/activate - pip install -e ./release - python -u ./release/rtool.py bdist - python -u ./release/rtool.py upload-snapshot --bdist + tox -e rtool -- upload-snapshot --bdist fi notifications: |