From 05b7a1c718641d0a25a9e71d363df9fd0de5e90a Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Tue, 4 Aug 2015 09:36:37 +0200 Subject: [PATCH 1/2] update travis config * remove sudo * cache pip * setup DISPLAY for wkhtmltopdf * use travis_after_tests_success --- .travis.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9dc5ff5..e05a5b6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,14 @@ +sudo: false +cache: pip + addons: apt: - packages: + sources: + - pov-wkhtmltopdf + packages: - expect-dev # provides unbuffer utility - python-lxml # because pip installation is slow + - wkhtmltopdf language: python @@ -17,11 +23,13 @@ env: virtualenv: system_site_packages: true +before_install: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" + install: - git clone https://github.com/OCA/reporting-engine.git ${HOME}/reporting-engine -b ${VERSION} - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - - wget http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1_linux-precise-amd64.deb - - sudo dpkg -i wkhtmltox-0.12.1_linux-precise-amd64.deb - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - travis_install_nightly @@ -29,4 +37,4 @@ script: - travis_run_tests after_success: - coveralls + - travis_after_tests_success From 06dd2fe602ac930ff4b1e74e0725f28aeb92d34b Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Tue, 4 Aug 2015 09:53:59 +0200 Subject: [PATCH 2/2] remove clone already performed through oca_dependencies.txt --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e05a5b6f..90009896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ before_install: - "sh -e /etc/init.d/xvfb start" install: - - git clone https://github.com/OCA/reporting-engine.git ${HOME}/reporting-engine -b ${VERSION} - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - travis_install_nightly