diff options
| author | Mike McQuaid | 2015-02-19 11:44:56 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-02-19 11:44:56 +0000 |
| commit | ba7238f28de199552c4e75c8d18e2fb278297b56 (patch) | |
| tree | c8d6d37b2a7a17364003c003d805d320a5aa64ba /Library/Homebrew | |
| parent | 548600b026dfdcaf1b4c6173c08e148514c027ad (diff) | |
| download | homebrew-ba7238f28de199552c4e75c8d18e2fb278297b56.tar.bz2 | |
test-bot: move reset logic above tapping.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 255657fd2..5cb6cd10f 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -649,6 +649,15 @@ module Homebrew ENV['HOMEBREW_LOGS'] = "#{Dir.pwd}/logs" end + if ARGV.include? "--ci-reset-and-update" + safe_system "git", "reset", "--hard" + Dir.glob("#{HOMEBREW_LIBRARY}/Taps/*/*") do |tap| + cd tap { safe_system "git", "reset", "--hard" } + end + safe_system "brew", "update" + return + end + repository = Homebrew.homebrew_git_repo tap # Tap repository if required, this is done before everything else @@ -661,15 +670,6 @@ module Homebrew end end - if ARGV.include? "--ci-reset-and-update" - safe_system "git", "reset", "--hard" - Dir.glob("#{HOMEBREW_LIBRARY}/Taps/*/*") do |tap| - cd tap { safe_system "git", "reset", "--hard" } - end - safe_system "brew", "update" - return - end - if ARGV.include? '--ci-upload' jenkins = ENV['JENKINS_HOME'] job = ENV['UPSTREAM_JOB_NAME'] |
