Merge pull request #576 from rspec/update-travis-build-scripts-2014-0…

…2-12-for-2-99-maintenance

Updates from rspec-dev (2014-02-12)

.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

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
 

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

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