admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

test-bot: have --cleanup clean core repo as well as tested tap

Browse Source 
Fixes Homebrew/homebrew#50651
This commit is contained in:
Andrew Janke 2016-04-03 00:58:53 -04:00 committed by Xu Cheng
parent 232eccc428
commit 6283a274c8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cmd/test-bot.rb
View File

@ -639,7 +639,14 @@ module Homebrew
git "rebase", "--abort" git "rebase", "--abort"
git "reset", "--hard" git "reset", "--hard"
git "checkout", "-f", "master" git "checkout", "-f", "master"
git "clean", "-ffdx" unless ENV["HOMEBREW_RUBY"] == "1.8.7" git "clean", "-ffdx"
HOMEBREW_REPOSITORY.cd do
safe_system "git", "reset", "--hard"
safe_system "git", "checkout", "-f", "master"
# This will uninstall all formulae, as long as
# HOMEBREW_REPOSITORY == HOMEBREW_PREFIX, which is true on the test bots
safe_system "git", "clean", "-ffdx" unless ENV["HOMEBREW_RUBY"] == "1.8.7"
end
pr_locks = "#{@repository}/.git/refs/remotes/*/pr/*/*.lock" pr_locks = "#{@repository}/.git/refs/remotes/*/pr/*/*.lock"
Dir.glob(pr_locks) { |lock| FileUtils.rm_rf lock } Dir.glob(pr_locks) { |lock| FileUtils.rm_rf lock }
end end
@ -660,6 +667,10 @@ module Homebrew
test "brew", "cleanup", "--prune=7" test "brew", "cleanup", "--prune=7"
git "gc", "--auto" git "gc", "--auto"
test "git", "clean", "-ffdx" test "git", "clean", "-ffdx"
HOMEBREW_REPOSITORY.cd do
safe_system "git", "reset", "--hard"
safe_system "git", "clean", "-ffdx"
end
if ARGV.include? "--local" if ARGV.include? "--local"
FileUtils.rm_rf ENV["HOMEBREW_HOME"] FileUtils.rm_rf ENV["HOMEBREW_HOME"]
FileUtils.rm_rf ENV["HOMEBREW_LOGS"] FileUtils.rm_rf ENV["HOMEBREW_LOGS"]