Merge 44d48da into 2a84ab5

rspec · Feb 8, 2014 · 47208bb · 47208bb
2 parents 2a84ab5 + 44d48da
commit 47208bb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2014-01-25T09:32:04-08:00 from the rspec-dev repo.
+# This file was generated on 2014-02-08T14:27:25+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"
@@ -13,11 +13,12 @@ rvm:
   - ruby-head
   - ree
   - jruby-18mode
-  - jruby-19mode
+  - jruby
   - jruby-head
   - rbx
 matrix:
   allow_failures:
+    - rvm: jruby-18mode
     - rvm: jruby-head
     - rvm: ruby-head
   fast_finish: true
diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2014-01-25T09:32:04-08:00 from the rspec-dev repo.
+# This file was generated on 2014-02-08T14:27:25+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
@@ -12,7 +12,10 @@ if is_mri; then
   clone_repo "rspec-core"
   clone_repo "rspec-expectations"
   clone_repo "rspec-mocks"
-  clone_repo "rspec-support"
+
+  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ]; then
+    clone_repo "rspec-support"
+  fi
 
   popd
 else

diff --git a/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2014-01-25T09:32:04-08:00 from the rspec-dev repo.
+# This file was generated on 2014-02-08T14:27:25+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

diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2014-01-25T09:32:04-08:00 from the rspec-dev repo.
+# This file was generated on 2014-02-08T14:27:25+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,10 @@ if is_mri; then
   run_spec_suite_for "rspec-core"
   run_spec_suite_for "rspec-expectations"
   run_spec_suite_for "rspec-mocks"
-  run_spec_suite_for "rspec-support"
+
+  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ]; then
+    run_spec_suite_for "rspec-support"
+  fi
 else
   echo "Skipping the rest of the build on non-MRI rubies"
 fi