From 0e0143549e573fa3296c7c42b2e2c56cfb6f4670 Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Tue, 22 Nov 2016 12:32:18 -0500
Subject: [PATCH 1/2] Update travis config for yarn changes

See https://blog.travis-ci.com/2016-11-21-travis-ci-now-supports-yarn
---
 .travis.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ce9da04be..628c3fd4d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,19 @@ language: rust
 rust: nightly
 sudo: false
 
-cache:
-  directories:
-    - $HOME/.yarn-cache
+cache: yarn
 
 before_install:
   - nvm install 4.6.0
   - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - npm config set spin false
-  - npm install -g yarn
+  - sudo apt-key adv --keyserver pgp.mit.edu --recv D101F7899D41F3C3
+  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq yarn
+  
+cache:
+  directories:
+  - $HOME/.yarn-cache
 
 install:
   - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH

From d72dfa7ce99722ed4131363496399639b568a31c Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Tue, 22 Nov 2016 12:33:20 -0500
Subject: [PATCH 2/2] remove extra cache directive

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

diff --git a/.travis.yml b/.travis.yml
index 628c3fd4d0..c8c68bd96d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,6 @@ before_install:
   - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq yarn
-  
-cache:
-  directories:
-  - $HOME/.yarn-cache
 
 install:
   - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH