diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-09-30 18:07:06 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-09-30 18:07:06 +0200 |
| commit | 9a9b0643a508821a28a8a2ec1fd4c31b4ffca471 (patch) | |
| tree | 63615cd693e261cbdf35c5b344e3d6009b3a2e93 | |
| parent | 715157a7d0348864e042603b1200eb1372b50225 (diff) | |
| download | qutebrowser-9a9b0643a508821a28a8a2ec1fd4c31b4ffca471.tar.gz qutebrowser-9a9b0643a508821a28a8a2ec1fd4c31b4ffca471.zip | |
Update CI files from master.
| -rw-r--r-- | .appveyor.yml | 1 | ||||
| -rw-r--r-- | .travis.yml | 30 |
2 files changed, 15 insertions, 16 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index abaf0de72..2a01ba3dc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,5 +14,4 @@ test_script: - C:\Python34\Scripts\tox -e py34 - C:\Python34\Scripts\tox -e py34-integration - C:\Python34\Scripts\tox -e unittests-frozen - - C:\Python34\Scripts\tox -e smoke-frozen - C:\Python34\Scripts\tox -e pylint diff --git a/.travis.yml b/.travis.yml index 8012257a0..f142e263b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ -dist: trusty +# So we get Ubuntu Trusty - using "dist: trusty" breaks OS X. +services: docker os: - linux @@ -12,22 +13,21 @@ cache: - $HOME/.cache/pip - $HOME/build/The-Compiler/qutebrowser/.cache +env: + - PATH=/home/travis/bin:/home/travis/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + + install: - python scripts/dev/ci_install.py script: - xvfb-run -s "-screen 0 640x480x16" tox -e py34,py34-integration - - tox -e misc - - tox -e pep257 - - tox -e pyflakes - - tox -e pep8 - - tox -e mccabe - - tox -e pylint - - tox -e pyroma - - tox -e check-manifest - -# Travis bug - OS X builds get routed to Ubuntu Trusty if "dist: trusty" is -# given. -matrix: - allow_failures: - - os: osx + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e unittests-nodisp || true' + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e misc || true' + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e pep257 || true' + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e pyflakes || true' + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e pep8 || true' + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e mccabe || true' + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e pyroma || true' + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e check-manifest || true' + - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e pylint || true' |