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

test-bot: make ci-reset-and-update a standalone method

Browse Source
This commit is contained in:
Xu Cheng 2015-09-18 19:48:05 +08:00
parent a6c5fca3a9
commit 658bdc2565
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,6 +701,20 @@ module Homebrew
end
end
def test_bot_ci_reset_and_update
Tap.each do |tap|
next unless tap.git?
cd tap.path do
quiet_system "git", "am", "--abort"
quiet_system "git", "rebase", "--abort"
safe_system "git", "checkout", "-f", "master"
safe_system "git", "reset", "--hard", "origin/master"
end
end
exec "brew", "update"
end
def test_bot
tap = ARGV.value("tap")
@ -752,18 +766,7 @@ module Homebrew
ENV["HOMEBREW_LOGS"] = "#{Dir.pwd}/logs"
end
if ARGV.include? "--ci-reset-and-update"
Dir.glob("#{HOMEBREW_LIBRARY}/Taps/*/*") do |tap_dir|
cd tap_dir do
system "git am --abort 2>/dev/null"
system "git rebase --abort 2>/dev/null"
safe_system "git", "checkout", "-f", "master"
safe_system "git", "reset", "--hard", "origin/master"
end
end
safe_system "brew", "update"
return
end
test_bot_ci_reset_and_update if ARGV.include? "--ci-reset-and-update"
repository = Homebrew.homebrew_git_repo tap