From 0d3bc1ed469a62f85e8fdeb34f8ca289880ea9a6 Mon Sep 17 00:00:00 2001
From: Jon Rowe <hello@jonrowe.co.uk>
Date: Wed, 12 Feb 2014 09:28:03 +1100
Subject: [PATCH] Updated travis build scripts (from rspec-dev)

---
 .travis.yml                  |  3 +--
 script/clone_all_rspec_repos |  4 ++--
 script/functions.sh          | 11 ++++++++++-
 script/run_build             |  4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 635b7f44a..041eed75e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2014-02-10T09:51:50-08:00 from the rspec-dev repo.
+# This file was generated on 2014-02-12T09:27:50+11:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 before_install: "script/clone_all_rspec_repos"
@@ -18,7 +18,6 @@ rvm:
   - rbx
 matrix:
   allow_failures:
-    - rvm: jruby-18mode
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx
diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
index d315abedc..9bf05e81c 100755
--- a/script/clone_all_rspec_repos
+++ b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2014-02-10T09:51:50-08:00 from the rspec-dev repo.
+# This file was generated on 2014-02-12T09:27:50+11:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e -x
@@ -13,7 +13,7 @@ if is_mri; then
   clone_repo "rspec-expectations"
   clone_repo "rspec-mocks"
 
-  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ]; then
+  if rspec_support_compatible; then
     clone_repo "rspec-support"
   fi
 
diff --git a/script/functions.sh b/script/functions.sh
index 81f687d5c..1d45b986f 100644
--- a/script/functions.sh
+++ b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2014-02-10T09:51:50-08:00 from the rspec-dev repo.
+# This file was generated on 2014-02-12T09:27:50+11:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # idea taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
@@ -52,6 +52,15 @@ function is_mri_192 {
   fi
 }
 
+function rspec_support_compatible {
+  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ] && [ "$MAINTENANCE_BRANCH" != "2-14-maintenance" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+
 function clone_repo {
   if [ ! -d $1 ]; then # don't clone if the dir is already there
     travis_retry git clone git://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH
diff --git a/script/run_build b/script/run_build
index b065886e0..17f0e978b 100755
--- a/script/run_build
+++ b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2014-02-10T09:51:50-08:00 from the rspec-dev repo.
+# This file was generated on 2014-02-12T09:27:50+11:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e -x
@@ -14,7 +14,7 @@ if is_mri; then
   run_spec_suite_for "rspec-expectations"
   run_spec_suite_for "rspec-mocks"
 
-  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ]; then
+  if rspec_support_compatible; then
     run_spec_suite_for "rspec-support"
   fi
 else