diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2018-05-18 10:37:56 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2018-05-19 12:38:44 +0200 |
| commit | 46960fa080c63b912c76321f790573fe4995ed49 (patch) | |
| tree | 64d4c3fd8dd4c7c8512ef4dc6539ff19be14a55d /.travis.yml | |
| parent | eaca8fdaf7b1b3c81451a407593aa7ea7f9ffc31 (diff) | |
| download | mitmproxy-46960fa080c63b912c76321f790573fe4995ed49.tar.gz mitmproxy-46960fa080c63b912c76321f790573fe4995ed49.tar.bz2 mitmproxy-46960fa080c63b912c76321f790573fe4995ed49.zip | |
add docker to the main repository
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index c601955d..7ec2e789 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,12 @@ matrix: - os: osx osx_image: xcode7.3 language: generic - env: TOXENV=py36 BDIST=1 + env: TOXENV=py36 CIBUILD=1 PYINSTALLER=1 - python: 3.6 - env: TOXENV=py36 BDIST=1 WHEEL=1 + env: TOXENV=py36 CIBUILD=1 PYINSTALLER=1 WHEEL=1 DOCKER=1 + sudo: required + services: + - docker - python: 3.6 env: TOXENV=individual_coverage - python: "3.7-dev" @@ -67,19 +70,16 @@ install: - pip install tox virtualenv setuptools script: + # All these steps MUST succeed for the job to be successful! + # Using the after_success block DOES NOT capture errors. + # Pull requests might break our build - we need to check this. + # Pull requests are not allowed to upload build artifacts - enforced by cibuild script. - tox -- --verbose --cov-report=term - | - if [[ $BDIST == "1" ]] + if [[ $CIBUILD == "1" ]] then git fetch --unshallow --tags - tox -e cibuild -- build - fi - -after_success: - - | - if [[ $BDIST == "1" ]] - then - tox -e cibuild -- upload + tox -e cibuild -- build && tox -e cibuild -- upload fi notifications: |