Merge pull request #861 from rspec/revert-859-update-travis-build-scr…

…ipts-2015-01-08-for-master Revert "Updates from rspec-dev (2015-01-08)"
rspec · Jan 11, 2015 · 9f5babd · 9f5babd
2 parents 44dee47 + 91e6a77
commit 9f5babd
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 49 deletions.
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-08T19:12:50-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-07T22:08:46-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.
 
 # This file contains defaults for RSpec projects. Individual projects

diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-08T19:12:50-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-07T22:08:46-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.
 
 language: ruby

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-08T19:12:50-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-07T22:08:46-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.
 
 version: "{build}"

diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,23 +1,24 @@
 #!/bin/bash
-# This file was generated on 2015-01-08T19:12:50-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-07T22:08:46-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
 source script/functions.sh
 
-pushd ..
-
-clone_repo "rspec"
-clone_repo "rspec-core"
-clone_repo "rspec-expectations"
-clone_repo "rspec-mocks"
-
 if is_mri; then
+  pushd ..
+
+  clone_repo "rspec"
+  clone_repo "rspec-core"
+  clone_repo "rspec-expectations"
+  clone_repo "rspec-mocks"
   clone_repo "rspec-rails"
-fi
 
-if rspec_support_compatible; then
-  clone_repo "rspec-support"
-fi
+  if rspec_support_compatible; then
+    clone_repo "rspec-support"
+  fi
 
-popd
+  popd
+else
+  echo "Not cloning all repos since we are not on MRI and they are only needed for the MRI build"
+fi
diff --git a/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-08T19:12:50-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-07T22:08:46-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.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -58,13 +58,9 @@ function run_cukes {
 function run_specs_one_by_one {
   echo "Running each spec file, one-by-one..."
 
-  if is_mri; then
-    for file in `find spec -iname '*_spec.rb'`; do
-      bin/rspec $file -b --format progress
-    done
-  else
-    echo "Skipping one-by-one specs on non-MRI rubies as they tend to have long boot times"
-  fi
+  for file in `find spec -iname '*_spec.rb'`; do
+    bin/rspec $file -b --format progress
+  done
 }
 
 function run_spec_suite_for {
@@ -73,7 +69,7 @@ function run_spec_suite_for {
     pushd ../$1
     unset BUNDLE_GEMFILE
     bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
-    travis_retry eval "time bundle install $bundle_install_flags"
+    travis_retry eval "bundle install $bundle_install_flags"
     run_specs_and_record_done
     popd
   fi;
@@ -125,12 +121,7 @@ function run_all_spec_suites {
   fold "rspec-core specs" run_spec_suite_for "rspec-core"
   fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
   fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
-
-  if is_mri; then
-    fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
-  else
-    echo "Skipping rspec-rails specs on non-MRI rubies"
-  fi
+  fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
 
   if rspec_support_compatible; then
     fold "rspec-support specs" run_spec_suite_for "rspec-support"

diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-08T19:12:50-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-07T22:08:46-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.
 
 function is_mri {
@@ -11,18 +11,6 @@ function is_mri {
   fi;
 }
 
-function is_jruby_20_mode {
-  if [ -z "$JRUBY_OPTS" ]; then
-    if ruby -e "exit(RUBY_VERSION == '2.0.0')"; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
-
 function is_mri_192 {
   if is_mri; then
     if ruby -e "exit(RUBY_VERSION == '1.9.2')"; then

diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-01-08T19:12:50-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-07T22:08:46-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
@@ -21,8 +21,8 @@ if style_and_lint_enforced; then
   fold "rubocop" check_style_and_lint
 fi
 
-if is_jruby_20_mode; then
-  echo "Skipping other specs suites on JRuby 2.0 mode because it is so much slower"
-else
+if is_mri; then
   run_all_spec_suites
+else
+  echo "Skipping the rest of the build on non-MRI rubies"
 fi
diff --git a/script/travis_functions.sh b/script/travis_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-08T19:12:50-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-07T22:08:46-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.
 
 # Taken from: