From 761930f3aef457a5e9985837b5c1f900d592b68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 3 Feb 2015 21:40:55 -0800
Subject: [PATCH] Opt in to new Travis container-based architecture

---
 .travis.yml | 8 ++++----
 script/test | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1435e264..2dede70a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
-install: script/cached-bundle install --path ./bundle --without development -j 3 -r 3
-
-script: bundle exec script/test
-
+sudo: false
 language: ruby
+script: bundle exec script/test
+bundler_args: --without development --path vendor/bundle --jobs=3 --retry=3
+cache: bundler
 
 rvm:
   - 1.8.7
diff --git a/script/test b/script/test
index beb9af238..180dbdd3e 100755
--- a/script/test
+++ b/script/test
@@ -151,7 +151,7 @@ run_test_files() {
 
 check_warnings() {
   # Display Ruby warnings from this project's source files. Abort if any were found.
-  num="$(grep -F "$PWD" "$warnings" | grep -v "${PWD}/bundle" | sort | uniq -c | sort -rn | tee /dev/stderr | wc -l)"
+  num="$(grep -F "$PWD" "$warnings" | grep -v "${PWD}/vendor/bundle" | sort | uniq -c | sort -rn | tee /dev/stderr | wc -l)"
   rm -f "$warnings"
   if [ "$num" -gt 0 ]; then
     echo "FAILED: this test suite doesn't tolerate Ruby syntax warnings!" >&2