Skip to content
Snippets Groups Projects
Commit 0ce71f33 authored by Mike McQuaid's avatar Mike McQuaid
Browse files

test-bot: move reset logic above tapping.

parent 857da689
No related branches found
No related tags found
No related merge requests found
...@@ -649,6 +649,15 @@ module Homebrew ...@@ -649,6 +649,15 @@ module Homebrew
ENV['HOMEBREW_LOGS'] = "#{Dir.pwd}/logs" ENV['HOMEBREW_LOGS'] = "#{Dir.pwd}/logs"
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
repository = Homebrew.homebrew_git_repo tap repository = Homebrew.homebrew_git_repo tap
# Tap repository if required, this is done before everything else # Tap repository if required, this is done before everything else
...@@ -661,15 +670,6 @@ module Homebrew ...@@ -661,15 +670,6 @@ module Homebrew
end end
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' if ARGV.include? '--ci-upload'
jenkins = ENV['JENKINS_HOME'] jenkins = ENV['JENKINS_HOME']
job = ENV['UPSTREAM_JOB_NAME'] job = ENV['UPSTREAM_JOB_NAME']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment