utils/gems: fix bundler sometimes unnecessarily reinstalling

This commit is contained in:
Bo Anderson 2023-06-06 23:32:52 +01:00
parent e37650d122
commit c93bc7df45
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65

View File

@ -134,13 +134,19 @@ module Homebrew
end end
def install_bundler! def install_bundler!
old_bundler_version = ENV.fetch("BUNDLER_VERSION", nil)
setup_gem_environment! setup_gem_environment!
ENV["BUNDLER_VERSION"] = HOMEBREW_BUNDLER_VERSION # Set so it correctly finds existing installs
install_gem_setup_path!( install_gem_setup_path!(
"bundler", "bundler",
version: HOMEBREW_BUNDLER_VERSION, version: HOMEBREW_BUNDLER_VERSION,
executable: "bundle", executable: "bundle",
setup_gem_environment: false, setup_gem_environment: false,
) )
ensure
ENV["BUNDLER_VERSION"] = old_bundler_version
end end
def install_bundler_gems!(only_warn_on_failure: false, setup_path: true, groups: []) def install_bundler_gems!(only_warn_on_failure: false, setup_path: true, groups: [])