Skip to content

Commit 6d4784c

Browse files
committed
Use the bundler flags of the current dir repo.
They vary a bit. rails doesn't play so nice with `--standalone` so it 's important that we use rspec-rails' .travis.yml bundler flags.
1 parent 47969b4 commit 6d4784c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

travis/script/functions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
export JRUBY_OPTS='-X-C' # disable JIT since these processes are so short lived
33
SPECS_HAVE_RUN_FILE=specs.out
44
MAINTENANCE_BRANCH=`cat maintenance-branch`
5-
BUNDLE_INSTALL_FLAGS=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
65

76
# Taken from:
87
# https://github.com/travis-ci/travis-build/blob/e9314616e182a23e6a280199cd9070bfc7cae548/lib/travis/build/script/templates/header.sh#L34-L53
@@ -126,7 +125,8 @@ function run_spec_suite_for {
126125
echo "Running specs for $1"
127126
echo
128127
unset BUNDLE_GEMFILE
129-
travis_retry bundle install $BUNDLE_INSTALL_FLAGS
128+
bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
129+
travis_retry bundle install $bundle_install_flags
130130
run_specs_and_record_done
131131
popd
132132
fi;

0 commit comments

Comments
 (0)