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

test: set Git name and email.

Browse Source 
Extract the code from `bottle.rb` into `utils/git.rb` and ensure it's
run before we run tests.

Should resolve issues like in
https://github.com/Homebrew/homebrew-core/pull/50328
This commit is contained in:
Mike McQuaid 2020-02-17 19:40:44 +00:00
parent 27fa87c94a
commit f31e01c3ad
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,15 +558,7 @@ module Homebrew
end end
unless args.no_commit? unless args.no_commit?
if ENV["HOMEBREW_GIT_NAME"] Utils.set_git_name_email!
ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"] =
ENV["HOMEBREW_GIT_NAME"]
end
if ENV["HOMEBREW_GIT_EMAIL"]
ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] =
ENV["HOMEBREW_GIT_EMAIL"]
end
short_name = formula_name.split("/", -1).last short_name = formula_name.split("/", -1).last
pkg_version = bottle_hash["formula"]["pkg_version"] pkg_version = bottle_hash["formula"]["pkg_version"]

1
Library/Homebrew/formula.rb
View File

@ -1744,6 +1744,7 @@ class Formula
} }
ENV.clear_sensitive_environment! ENV.clear_sensitive_environment!
Utils.set_git_name_email!
mktemp("#{name}-test") do |staging| mktemp("#{name}-test") do |staging|
staging.retain! if ARGV.keep_tmp? staging.retain! if ARGV.keep_tmp?

8
Library/Homebrew/utils/git.rb
View File

@ -102,4 +102,12 @@ module Utils
quiet_system "git", "ls-remote", url quiet_system "git", "ls-remote", url
end end
def self.set_git_name_email!
return unless ENV["HOMEBREW_GIT_NAME"]
return unless ENV["HOMEBREW_GIT_EMAIL"]
ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"] = ENV["HOMEBREW_GIT_NAME"]
ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] = ENV["HOMEBREW_GIT_EMAIL"]
end
end end