Skip to content

Commit dbb0ec4

Browse files
committed
Force bundler to install binstubs
1 parent fd443d7 commit dbb0ec4

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ bundler_args: "--binstubs --path ../bundle --retry=3 --jobs=3"
2424

2525
before_install:
2626
- script/clone_all_rspec_repos
27-
- gem update bundler
27+
# Note this doesn't work on JRUBY 2.0.0 mode so we don't do it, the excluded versions are broken on Ruby 2.3
28+
- if [ "jruby" != "$TRAVIS_RUBY_VERSION" ]; then gem install bundler --version "1.11.2"; fi
29+
- alias bundle="bundle _1.11.2_"
2830

2931
before_script:
3032
# Rails 4.x complains with a bundler rails binstub in PROJECT_ROOT/bin/

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ namespace :generate do
5959
bindir = File.expand_path("bin")
6060

6161
# Rails 4 cannot use a `rails` binstub generated by Bundler
62+
sh "bundle binstubs bundler --force"
6263
sh "rm -f #{bindir}/rails"
6364
sh "bundle exec rails new ./tmp/example_app --no-rc --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
6465

0 commit comments

Comments
 (0)