Merge pull request #6886 from MikeMcQuaid/hardcode-bundler-version

utils/gems: hardcode bundler version.
This commit is contained in:
Mike McQuaid 2020-01-02 08:37:06 +00:00 committed by GitHub
commit 83fd531b62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,6 +7,9 @@
require "English" require "English"
module Homebrew module Homebrew
# Keep in sync with the Gemfile.lock's BUNDLED WITH.
HOMEBREW_BUNDLER_VERSION = "1.17.2"
module_function module_function
def ruby_bindir def ruby_bindir
@ -86,7 +89,12 @@ module Homebrew
def install_bundler! def install_bundler!
require "rubygems" require "rubygems"
setup_gem_environment!(gem_home: Gem.user_dir, gem_bindir: gem_user_bindir) setup_gem_environment!(gem_home: Gem.user_dir, gem_bindir: gem_user_bindir)
install_gem_setup_path!("bundler", version: ">=1.17", executable: "bundle", setup_gem_environment: false) install_gem_setup_path!(
"bundler",
version: HOMEBREW_BUNDLER_VERSION,
executable: "bundle",
setup_gem_environment: false,
)
end end
def install_bundler_gems! def install_bundler_gems!