From 7b16b7345760e13ab6ec1460c1f467df98e97b7a Mon Sep 17 00:00:00 2001
From: James Hall <james@parall.ax>
Date: Wed, 12 Oct 2016 10:08:08 +0100
Subject: [PATCH 1/8] Use Yarn instead

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 63f7b3503..ec697b78a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
 language: node_js
 node_js:
   - "4"
+before_script:
+  - npm install -g yarn
+install: yarn

From 1938b4e27050e465d7a32fe7a1d12737ffff2f3d Mon Sep 17 00:00:00 2001
From: James Hall <james@parall.ax>
Date: Wed, 12 Oct 2016 10:09:38 +0100
Subject: [PATCH 2/8] Try install yarn as part of the install phase

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec697b78a..f662a45de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
   - "4"
-before_script:
+install:
   - npm install -g yarn
-install: yarn
+  - yarn

From 0387371e53267f83b2c2929b764c33a4e2d7861d Mon Sep 17 00:00:00 2001
From: James Hall <james@parall.ax>
Date: Wed, 12 Oct 2016 10:16:17 +0100
Subject: [PATCH 3/8] Cache the yarn directory

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f662a45de..f3c8148e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,6 @@ node_js:
 install:
   - npm install -g yarn
   - yarn
+cache:
+  directories:
+    - ~/.yarn

From ff2399680cc2d823264219dc83566e555b03d363 Mon Sep 17 00:00:00 2001
From: James Hall <james@parall.ax>
Date: Wed, 12 Oct 2016 10:21:37 +0100
Subject: [PATCH 4/8] Cache .nvm

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f3c8148e3..519e1524a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,4 @@ install:
 cache:
   directories:
     - ~/.yarn
+    - ~/.nvm

From 8bdc29ffea956a72a520bf50aa813560c91d13f5 Mon Sep 17 00:00:00 2001
From: James Hall <james@parall.ax>
Date: Wed, 12 Oct 2016 10:27:25 +0100
Subject: [PATCH 5/8] Install yarn quicker

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 519e1524a..624cf3deb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,8 @@ language: node_js
 node_js:
   - "4"
 install:
-  - npm install -g yarn
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
   - yarn
 cache:
   directories:
     - ~/.yarn
-    - ~/.nvm

From be488f0c56812f9be2781947ae9e6c864b7d54cf Mon Sep 17 00:00:00 2001
From: James Hall <james@parall.ax>
Date: Wed, 12 Oct 2016 10:33:57 +0100
Subject: [PATCH 6/8] Install yarn quicker if not already in the cache

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 624cf3deb..fac6f7e3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ language: node_js
 node_js:
   - "4"
 install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  # If the ~/.yarn folder doesn't exist, then install it
+  - if [ ! -d ~/.yarn ]; then (curl -o- -L https://yarnpkg.com/install.sh | bash) ; fi
+  - export PATH="$HOME/.yarn/bin:$PATH"
   - yarn
 cache:
   directories:

From c7f5f951e4e0c46dcf85d5ba83ebf006c94889ec Mon Sep 17 00:00:00 2001
From: James Hall <james@parall.ax>
Date: Wed, 12 Oct 2016 10:36:24 +0100
Subject: [PATCH 7/8] Use cache yarn

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fac6f7e3a..142a6bf8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@ node_js:
 install:
   # If the ~/.yarn folder doesn't exist, then install it
   - if [ ! -d ~/.yarn ]; then (curl -o- -L https://yarnpkg.com/install.sh | bash) ; fi
-  - export PATH="$HOME/.yarn/bin:$PATH"
-  - yarn
+  - ~/.yarn/bin/yarn
 cache:
   directories:
     - ~/.yarn

From c6d4f48b1e2bce6ab49c164dd3c543f7e51f854b Mon Sep 17 00:00:00 2001
From: James Hall <james@parall.ax>
Date: Wed, 12 Oct 2016 10:38:17 +0100
Subject: [PATCH 8/8] Go with simpler npm method

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 142a6bf8e..a7cbd83a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ language: node_js
 node_js:
   - "4"
 install:
-  # If the ~/.yarn folder doesn't exist, then install it
-  - if [ ! -d ~/.yarn ]; then (curl -o- -L https://yarnpkg.com/install.sh | bash) ; fi
-  - ~/.yarn/bin/yarn
+  - npm -g install yarn
+  - yarn
 cache:
   directories:
     - ~/.yarn
+    - ~/.nvm