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

test-bot: more tap upload improvements.

Browse Source
This commit is contained in:
Mike McQuaid 2014-11-23 16:59:54 +00:00
parent c925c22158
commit 62815f4b3d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/cmd/test-bot.rb
View File

@ -575,9 +575,9 @@ module Homebrew
# because Formula parsing and/or git commit hash lookup depends on it.
if tap
if !repository.directory?
system "brew", "tap", tap
safe_system "brew", "tap", tap
else
system "brew", "tap", "--repair"
safe_system "brew", "tap", "--repair"
end
end
@ -604,7 +604,16 @@ module Homebrew
safe_system "git", "checkout", "-f", "master"
safe_system "git", "reset", "--hard", "origin/master"
safe_system "brew", "update"
safe_system "brew", "pull", "--clean", pr if pr
if pr
pull_pr = if tap
user, repo = tap.split "/"
"https://github.com/#{user}/homebrew-#{repo}/pull/#{pr}"
else
pr
end
safe_system "brew", "pull", "--clean", pull_pr
end
ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"]
ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"]