From 5cdb0d0a6dfad1ae061fed54373f7d7d7da1047b Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 7 May 2017 16:00:04 +0100
Subject: [PATCH] Travis CI tweaks

Tweak our Travis CI configuration and the one we suggest for taps to
be faster and use caching.
---
 .travis.yml                         | 2 ++
 Library/Homebrew/dev-cmd/tap-new.rb | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f268e40ec6..dbf56e6b13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,11 @@ matrix:
       osx_image: xcode8.3
       rvm: system
     - os: linux
+      sudo: false
       rvm: 2.0.0
 
 before_install:
+  - rm -rf Library/Homebrew/vendor/bundle/
   - export GEM_HOME="$PWD/Library/Homebrew/vendor/ruby/2.0.0"
   - gem list --installed bundler || gem install bundler
   - export PATH="$GEM_HOME/bin:$PATH"
diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb
index 48449e98d5..0dbb5476da 100644
--- a/Library/Homebrew/dev-cmd/tap-new.rb
+++ b/Library/Homebrew/dev-cmd/tap-new.rb
@@ -46,9 +46,10 @@ module Homebrew
     travis = <<-EOS.undent
       language: ruby
       os: osx
-      env: OSX=10.12
       osx_image: xcode8.3
       rvm: system
+      cache:
+        directories: /usr/local/Homebrew/Library/Homebrew/vendor
 
       before_install:
         - export TRAVIS_COMMIT="$(git rev-parse --verify -q HEAD)"