From: Rob Golding <rob@robgolding.com>
Date: Mon, 10 Nov 2014 12:23:28 +0000 (+0000)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/0f726059e82fd9c3da2d1431de8715241b8ff6fe?hp=a69b8a097a7c2bddf7414a9facf261a432cae011

Merge branch 'master' into develop
---

diff --git a/.travis.yml b/.travis.yml
index bc6cd0e..5e24789 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
 language: python
 env:
-  - TASK_VERSION=2.1.1
-  - TASK_VERSION=2.1.2
-  - TASK_VERSION=2.2.0
+  - TASK_VERSION=v2.1.1
+  - TASK_VERSION=v2.1.2
+  - TASK_VERSION=v2.2.0
+  - TASK_VERSION=v2.3.0
+  - TASK_VERSION=2.4.0.beta2
+  - TASK_VERSION=2.4.0
 python:
   - "2.6"
   - "2.7"
@@ -12,9 +15,10 @@ python:
 install:
   - pip install -e .
   - sudo apt-get install -qq build-essential cmake uuid-dev
-  - wget http://archive.ubuntu.com/ubuntu/pool/universe/t/task/task_$TASK_VERSION.orig.tar.gz
-  - tar -zxvf task_$TASK_VERSION.orig.tar.gz
-  - cd task-$TASK_VERSION
+  - git clone https://git.tasktools.org/scm/tm/task.git
+  - cd task
+  - git checkout $TASK_VERSION
+  - git clean -dfx
   - cmake .
   - make
   - sudo make install