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

Merge pull request #11280 from MikeMcQuaid/earlier_install_bundler_gems

Browse Source 
dev-cmd: run Homebrew.install_bundler_gems! earlier.
This commit is contained in:
Mike McQuaid 2021-04-30 14:08:03 +01:00 committed by GitHub
commit 635029407b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -90,7 +90,10 @@ module Homebrew
def bottle def bottle
args = bottle_args.parse args = bottle_args.parse
return merge(args: args) if args.merge? if args.merge?
Homebrew.install_bundler_gems!
return merge(args: args)
end
ensure_relocation_formulae_installed! unless args.skip_relocation? ensure_relocation_formulae_installed! unless args.skip_relocation?
args.named.to_resolved_formulae(uniq: false).each do |f| args.named.to_resolved_formulae(uniq: false).each do |f|
@ -718,9 +721,7 @@ module Homebrew
next if no_bottle_changes next if no_bottle_changes
Homebrew.install_bundler_gems!
require "utils/ast" require "utils/ast"
formula_ast = Utils::AST::FormulaAST.new(path.read) formula_ast = Utils::AST::FormulaAST.new(path.read)
checksums = old_checksums(formula, formula_ast, bottle_hash, args: args) checksums = old_checksums(formula, formula_ast, bottle_hash, args: args)
update_or_add = checksums.nil? ? "add" : "update" update_or_add = checksums.nil? ? "add" : "update"

4
Library/Homebrew/dev-cmd/bump-cask-pr.rb
View File

@ -60,6 +60,10 @@ module Homebrew
def bump_cask_pr def bump_cask_pr
args = bump_cask_pr_args.parse args = bump_cask_pr_args.parse
# This will be run by `brew style` later so run it first to not start
# spamming during normal output.
Homebrew.install_bundler_gems!
# As this command is simplifying user-run commands then let's just use a # As this command is simplifying user-run commands then let's just use a
# user path, too. # user path, too.
ENV["PATH"] = ENV["HOMEBREW_PATH"] ENV["PATH"] = ENV["HOMEBREW_PATH"]

4
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -147,6 +147,10 @@ module Homebrew
formula_spec = formula.stable formula_spec = formula.stable
odie "#{formula}: no stable specification found!" if formula_spec.blank? odie "#{formula}: no stable specification found!" if formula_spec.blank?
# This will be run by `brew audit` later so run it first to not start
# spamming during normal output.
Homebrew.install_bundler_gems!
tap_remote_repo, remote, remote_branch, previous_branch = use_correct_linux_tap(formula, args: args) tap_remote_repo, remote, remote_branch, previous_branch = use_correct_linux_tap(formula, args: args)
check_open_pull_requests(formula, tap_remote_repo, args: args) check_open_pull_requests(formula, tap_remote_repo, args: args)

4
Library/Homebrew/dev-cmd/pr-upload.rb
View File

@ -146,6 +146,10 @@ module Homebrew
check_bottled_formulae!(bottles_hash) check_bottled_formulae!(bottles_hash)
# This will be run by `brew bottle` and `brew audit` later so run it first
# to not start spamming during normal output.
Homebrew.install_bundler_gems!
safe_system HOMEBREW_BREW_FILE, *bottle_args safe_system HOMEBREW_BREW_FILE, *bottle_args
json_files = Dir["*.bottle.json"] json_files = Dir["*.bottle.json"]