From 0ce71f33ad16ea5c627d36012d61b32a35cc16a5 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 19 Feb 2015 11:44:56 +0000
Subject: [PATCH] test-bot: move reset logic above tapping.
---
Library/Homebrew/cmd/test-bot.rb | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 255657fd28..5cb6cd10fc 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']
--
GitLab