Updated travis build scripts (from rspec-dev)

rspec · Jan 1, 2015 · 61b7c17 · 61b7c17
1 parent 69de705
commit 61b7c17
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 26 deletions.
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2014-12-31T23:38:56-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T12:50:25-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,21 +1,17 @@
-# This file was generated on 2014-12-31T23:38:56-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T12:50:25-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
 sudo: false
 cache:
   directories:
-    - ../rspec-core/bundle
-    - ../rspec-expectations/bundle
-    - ../rspec-mocks/bundle
-    - ../rspec-rails/bundle
-    - ../rspec-support/bundle
+    - ../bundle
 before_install:
   - "script/clone_all_rspec_repos"
   # Downgrade bundler to work around https://github.com/bundler/bundler/issues/3004
   # Note this doesn't work on JRUBY 2.0.0 mode so we don't do it
   - if [ -z "$JRUBY_OPTS" ]; then gem install bundler -v=1.5.3 && alias bundle="bundle _1.5.3_"; fi
-bundler_args: "--binstubs --standalone --without documentation --path bundle"
+bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "script/run_build"
 rvm:
   - 1.8.7

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2014-12-31T23:38:56-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T12:50:25-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 2014-12-31T23:38:56-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T12:50:25-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 2014-12-31T23:38:56-08:00 from the rspec-dev repo.
+# This file was generated on 2015-01-01T12:50:25-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 )"
@@ -11,15 +11,8 @@ SPECS_HAVE_RUN_FILE=specs.out
 MAINTENANCE_BRANCH=`cat maintenance-branch`
 
 function clone_repo {
-  if [ ! -e $1/Gemfile ]; then # don't reclone
-    # deal with our bundler cache directory.
-    # Git won't clone into a non-empty dir so we have to move it aside and move it back.
-    mkdir -p $1/bundle
-    pushd $1
-    mv bundle ../$1-bundle
-    travis_retry eval "git clone git://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH ."
-    mv ../$1-bundle bundle
-    popd
+  if [ ! -d $1 ]; then # don't clone if the dir is already there
+    travis_retry eval "git clone git://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH"
   fi;
 }
 
@@ -55,7 +48,7 @@ function run_cukes {
     else
       # Prepare RUBYOPT for scenarios that are shelling out to ruby,
       # and PATH for those that are using `rspec` or `rake`.
-      RUBYOPT="-I${PWD}/bundle -rbundler/setup" \
+      RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
          PATH="${PWD}/bin:$PATH" \
          bin/cucumber --strict
     fi
@@ -75,10 +68,18 @@ function run_spec_suite_for {
     echo "Running specs for $1"
     pushd ../$1
     unset BUNDLE_GEMFILE
-    bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
+
+    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
+
     travis_retry eval "bundle install $bundle_install_flags"
     run_specs_and_record_done
-    bundle clean # prep for travis caching
     popd
   fi;
 }

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