Skip to content

Commit ce4ceaf

Browse files
committed
Share the bundler install path.
1 parent c37a5a7 commit ce4ceaf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ before_script:
33
- rm -f bin/rails
44
- bundle exec rails --version
55
script: "script/run_build 2>&1"
6-
bundler_args: "--binstubs"
6+
bundler_args: "--binstubs --path ../bundle"
77
before_install:
88
# Downgrade bundler to work around https://github.com/bundler/bundler/issues/3004
99
- gem install bundler -v=1.5.3

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ namespace :generate do
5252

5353
# Rails 4 cannot use a `rails` binstub generated by Bundler
5454
sh "rm -f #{bindir}/rails"
55-
sh "bundle exec rails new ./tmp/example_app --skip-javascript --skip-sprockets --skip-git --skip-test-unit --template=templates/generate_app.rb"
55+
sh "bundle exec rails new ./tmp/example_app --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-bundle --template=templates/generate_app.rb"
5656

5757
if test ?d, bindir
5858
in_example_app do
59-
sh "bundle install --gemfile ./Gemfile --local"
59+
sh "bundle install --gemfile ./Gemfile --path ../../../bundle"
6060
# Rails 4 cannot use a `rails` binstub generated by Bundler
6161
sh "bundle binstubs rspec-core rake --force"
6262
sh "bundle binstubs rails" unless File.exist?("bin/rails")

0 commit comments

Comments
 (0)