admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

bundle: use HOMEBREW_BUNDLE_FORMULA_VERSION_* for formula version.

Browse Source 
As this variable is no longer just used for `brew bundle exec`.
This commit is contained in:
Mike McQuaid 2025-04-01 15:35:27 +01:00
parent f9baac24a2
commit 37752e3088
No known key found for this signature in database
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/bundle.rb
View File

@ -88,7 +88,9 @@ module Homebrew
formula_versions = {} formula_versions = {}
ENV.each do |key, value| ENV.each do |key, value|
match = key.match(/^HOMEBREW_BUNDLE_EXEC_FORMULA_VERSION_(.+)$/) match = key.match(/^HOMEBREW_BUNDLE_FORMULA_VERSION_(.+)$/)
# odeprecated: get rid of this in Homebrew >=4.5
match ||= key.match(/^HOMEBREW_BUNDLE_EXEC_FORMULA_VERSION_(.+)$/)
next if match.blank? next if match.blank?
formula_name = match[1] formula_name = match[1]

2
Library/Homebrew/test/bundle/commands/exec_spec.rb
View File

@ -45,7 +45,7 @@ RSpec.describe Homebrew::Bundle::Commands::Exec do
openssl_version = "1.1.1" openssl_version = "1.1.1"
ENV["PATH"] = "/opt/homebrew/opt/openssl/bin:/usr/bin:/bin" ENV["PATH"] = "/opt/homebrew/opt/openssl/bin:/usr/bin:/bin"
ENV["MANPATH"] = "/opt/homebrew/opt/openssl/man" ENV["MANPATH"] = "/opt/homebrew/opt/openssl/man"
ENV["HOMEBREW_BUNDLE_EXEC_FORMULA_VERSION_OPENSSL"] = openssl_version ENV["HOMEBREW_BUNDLE_FORMULA_VERSION_OPENSSL"] = openssl_version
allow(described_class).to receive(:which).and_return(Pathname("/usr/bin/bundle")) allow(described_class).to receive(:which).and_return(Pathname("/usr/bin/bundle"))
described_class.run("bundle", "install") described_class.run("bundle", "install")
expect(ENV.fetch("PATH")).to include("/Cellar/openssl/1.1.1/bin") expect(ENV.fetch("PATH")).to include("/Cellar/openssl/1.1.1/bin")