From 672f9b6d732df3a2eefaaaece22b28d4b4dbe30d Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@chrisrebert.com>
Date: Thu, 14 Jan 2016 14:14:34 -0800
Subject: [PATCH] Fix RVM under Travis caching by excluding node-which from
 $PATH

See https://github.com/travis-ci/travis-ci/issues/5092 for more details.
Reverts #18376
---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5ae1137adc..bf242a8369 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ node_js:
   - "4"
   - "5"
 before_install:
+  # Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
+  - export PATH=$(python -c 'from sys import argv;from collections import OrderedDict as od;print(":".join(od((p,None) for p in argv[1].split(":") if p.startswith("/")).keys()))' "$PATH")
   - rvm install 2.2
   - rvm use 2.2 --fuzzy
   - export GEMDIR=$(rvm gemdir)
@@ -19,11 +21,10 @@ install:
   - cp grunt/npm-shrinkwrap.json ./
   - npm install -g grunt-cli
   - npm install
-# Caching disabled due to https://github.com/travis-ci/travis-ci/issues/5092
-#cache:
-#  directories:
-#    - node_modules
-#    - vendor/bundle
+cache:
+  directories:
+    - node_modules
+    - vendor/bundle
 env:
   global:
     - SAUCE_USERNAME="bootstrap"