From 339a63ed696e7ce11242fd8a3f7cea141937c2d5 Mon Sep 17 00:00:00 2001 From: hugovk Date: Fri, 29 Aug 2014 16:03:58 +0300 Subject: [PATCH] Fail fast: move installation stuff that's not needed in the script: section closer to where it's needed. This saves time by avoiding it when a test fails. --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 783974b53..704c0d949 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,9 @@ python: - 3.4 install: - - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick lcov" + - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick" - "pip install cffi" - - "pip install coveralls nose coveralls-merge" - - "gem install coveralls-lcov" + - "pip install coverage nose" # Pyroma installation is slow on Py3, so just do it for Py2. - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then travis_retry pip install pyroma; fi @@ -42,13 +41,16 @@ script: after_success: # gather the coverage data + - sudo apt-get -qq install lcov - lcov --capture --directory . -b . --output-file coverage.info # filter to remove system headers - - lcov --remove coverage.info '/usr/*' -o coverage.filtered.info + - lcov --remove coverage.info '/usr/*' -o coverage.filtered.info # convert to json + - gem install coveralls-lcov - coveralls-lcov -v -n coverage.filtered.info > coverage.c.json - coverage report + - pip install coveralls-merge - coveralls-merge coverage.c.json