test-bot: move reset logic above tapping.
This commit is contained in:
parent
857da689bf
commit
0ce71f33ad
@ -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']
|
||||
|
Loading…
x
Reference in New Issue
Block a user