From 86a89c716d5623715fe1e7dccaa139d4f12f584a Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 16 Jul 2014 11:15:09 +0100 Subject: Show Travis test status against master branch only --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 6585a38..a8b3edb 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ django-wkhtmltopdf :target: http://badge.fury.io/py/django-wkhtmltopdf :alt: Latest version -.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png +.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png?branch=master :target: https://travis-ci.org/incuna/django-wkhtmltopdf :alt: Travis-CI -- cgit v1.2.3 From 23f08bc0d0b8ea0cd213f09c618f8cd9baabb1ed Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 16 Jul 2014 11:26:52 +0100 Subject: Fix wkhtmltox for Travis --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f3dacc..71a5ddb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,11 +19,11 @@ before_install: - "echo '## Installing dependencies'" - "sudo apt-get update" - "sudo apt-get install -y openssl build-essential xorg libssl-dev" - - "echo '## Downloading wkhtmltopdf 0.12.0'" - - "wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.0/wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz" + - "echo '## Downloading wkhtmltopdf 0.12.1'" + - "wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1.tar.bz2" - "mkdir -p $PWD" - "echo '## Extracting wkhtmltox into $PWD'" - - "tar xvJf wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz -C $PWD" + - "tar xvjf wkhtmltox-0.12.1.tar.bz2 -C $PWD" - "export WKHTMLTOPDF_CMD=$PWD/wkhtmltox/bin/wkhtmltopdf" install: - pip install $DJANGO -- cgit v1.2.3 From f51eaeed13842d90cc8f0422a597b0ac6a6f8418 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 16 Jul 2014 12:05:54 +0100 Subject: Use precompiled library not source one --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71a5ddb..9988bd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,15 +16,15 @@ matrix: env: DJANGO="Django>=1.4,<1.5" before_install: - PWD=`pwd` + - WHICH_WK=`which wkhtmltopdf` - "echo '## Installing dependencies'" - "sudo apt-get update" - "sudo apt-get install -y openssl build-essential xorg libssl-dev" - "echo '## Downloading wkhtmltopdf 0.12.1'" - - "wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1.tar.bz2" - - "mkdir -p $PWD" - - "echo '## Extracting wkhtmltox into $PWD'" - - "tar xvjf wkhtmltox-0.12.1.tar.bz2 -C $PWD" - - "export WKHTMLTOPDF_CMD=$PWD/wkhtmltox/bin/wkhtmltopdf" + - "wget http://freefr.dl.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1_linux-precise-amd64.deb" + - "echo '## Installing wkhtmltox'" + - "dpkg -i wkhtmltox-0.12.1_linux-precise-amd64.deb" + - "export WKHTMLTOPDF_CMD=$WHICH_WK" install: - pip install $DJANGO - pip install -r test_requirements.txt -- cgit v1.2.3 From 9913d8e6b9b410930f5108b685fb89a602664fc9 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 16 Jul 2014 12:12:56 +0100 Subject: Check for wkhtmltopdf after it was installed :D --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9988bd4..64075e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ matrix: env: DJANGO="Django>=1.4,<1.5" before_install: - PWD=`pwd` - - WHICH_WK=`which wkhtmltopdf` - "echo '## Installing dependencies'" - "sudo apt-get update" - "sudo apt-get install -y openssl build-essential xorg libssl-dev" @@ -24,6 +23,7 @@ before_install: - "wget http://freefr.dl.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1_linux-precise-amd64.deb" - "echo '## Installing wkhtmltox'" - "dpkg -i wkhtmltox-0.12.1_linux-precise-amd64.deb" + - WHICH_WK=`which wkhtmltopdf` - "export WKHTMLTOPDF_CMD=$WHICH_WK" install: - pip install $DJANGO -- cgit v1.2.3 From f9ce54704305bae5896f80130034ebaf2f363a7c Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 16 Jul 2014 12:23:08 +0100 Subject: Superuser privilege - Travis is picky! --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 64075e4..698a5ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: - "echo '## Downloading wkhtmltopdf 0.12.1'" - "wget http://freefr.dl.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1_linux-precise-amd64.deb" - "echo '## Installing wkhtmltox'" - - "dpkg -i wkhtmltox-0.12.1_linux-precise-amd64.deb" + - "sudo dpkg -i wkhtmltox-0.12.1_linux-precise-amd64.deb" - WHICH_WK=`which wkhtmltopdf` - "export WKHTMLTOPDF_CMD=$WHICH_WK" install: -- cgit v1.2.3