From 658bdc25651203f4ddb97f4e5f46ad258c8a73cc Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Fri, 18 Sep 2015 19:48:05 +0800 Subject: [PATCH] test-bot: make ci-reset-and-update a standalone method --- Library/Homebrew/cmd/test-bot.rb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index ba8d3e2968..da82e85361 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -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