From 787646a4a235dc6740f6e2ae6b98c3c59e347fbc Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Thu, 26 Jan 2017 15:11:50 +0000
Subject: [PATCH] Revert Travis config back to npm

---
 ghost/admin/.travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ghost/admin/.travis.yml b/ghost/admin/.travis.yml
index 4080f012b6..c7ffe462af 100644
--- a/ghost/admin/.travis.yml
+++ b/ghost/admin/.travis.yml
@@ -14,7 +14,6 @@ branches:
     - /^greenkeeper-.+$/
 
 cache:
-  yarn: true
   directories:
     - node_modules
 
@@ -26,14 +25,16 @@ addons:
     packages:
       - google-chrome-stable
 
+before_install:
+  - npm config --global set spin false
+  - npm install -g npm@^2
+
 install:
-  - npm i -g yarn
-  - yarn global add bower
-  - yarn
+  - npm install -g bower
+  - npm install
   - bower install
 
 before_script:
-  - yarn add --force node-sass # temporary, workaround for https://github.com/yarnpkg/yarn/issues/1981
   - export DISPLAY=:99; sh -e /etc/init.d/xvfb start; sleep 3;
 
 script: