Updated travis build scripts (from rspec-dev)

rspec · Jan 2, 2015 · 8f9ad96 · 8f9ad96
1 parent 2039603
commit 8f9ad96
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 18 deletions.
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-01T12:50:25-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T16:46:16-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-01T12:50:25-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T16:46:16-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-01T12:50:25-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T16:46:16-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,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-01-01T12:50:25-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T16:46:16-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

diff --git a/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-01T12:50:25-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T16:46:16-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 )"
@@ -68,16 +68,7 @@ function run_spec_suite_for {
     echo "Running specs for $1"
     pushd ../$1
     unset BUNDLE_GEMFILE
-
-    if [ $1 == "rspec-rails" ]; then
-      bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
-    else
-      # The other repos' master branch have `./bundle` as the bundler path, but we need them to all
-      # go into `../bundle`, so we are forcing it here rather than reading from `.travis.yml`.
-      # Once all the PRs are merged we can revert this.
-      bundle_install_flags="--binstubs --standalone --without documentation --path ../bundle"
-    fi
-
+    bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
     travis_retry eval "bundle install $bundle_install_flags"
     run_specs_and_record_done
     popd

diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-01T12:50:25-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T16:46:16-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 {

diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-01-01T12:50:25-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T16:46:16-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

diff --git a/script/travis_functions.sh b/script/travis_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2015-01-01T12:50:25-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T16:46:16-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: