Updated travis build scripts (from rspec-dev)

rspec · Feb 10, 2014 · 8f43214 · 8f43214
1 parent b8569fe
commit 8f43214
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2014-02-08T19:49:16+11:00 from the rspec-dev repo.
+# This file was generated on 2014-02-10T09:52:15-08: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"
@@ -21,4 +21,5 @@ matrix:
     - rvm: jruby-18mode
     - rvm: jruby-head
     - rvm: ruby-head
+    - rvm: rbx
   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-02-08T19:49:16+11:00 from the rspec-dev repo.
+# This file was generated on 2014-02-10T09:52:15-08: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 rspec_support_compatible; then
+  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ]; then
     clone_repo "rspec-support"
   fi
 

diff --git a/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2014-02-08T19:49:16+11:00 from the rspec-dev repo.
+# This file was generated on 2014-02-10T09:52:15-08: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,15 +52,6 @@ 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
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2014-02-08T19:49:16+11:00 from the rspec-dev repo.
+# This file was generated on 2014-02-10T09:52:15-08: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 rspec_support_compatible; then
+  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ]; then
     run_spec_suite_for "rspec-support"
   fi
 else