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

test-bot: more reset/cleanup tweaks.

Browse Source
This commit is contained in:
Mike McQuaid 2016-07-15 13:19:44 +01:00
parent d34b93fa1c
commit 3260397632
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/dev-cmd/test-bot.rb
View File

@ -681,13 +681,13 @@ module Homebrew
git "stash" git "stash"
git "am", "--abort" git "am", "--abort"
git "rebase", "--abort" git "rebase", "--abort"
git "reset", "--hard"
git "checkout", "-f", "master" git "checkout", "-f", "master"
git "reset", "--hard", "origin/master"
git "clean", "-ffdx" git "clean", "-ffdx"
unless @repository == HOMEBREW_REPOSITORY unless @repository == HOMEBREW_REPOSITORY
HOMEBREW_REPOSITORY.cd do HOMEBREW_REPOSITORY.cd do
safe_system "git", "reset", "--hard"
safe_system "git", "checkout", "-f", "master" safe_system "git", "checkout", "-f", "master"
safe_system "git", "reset", "--hard", "origin/master"
# This will uninstall all formulae, as long as # This will uninstall all formulae, as long as
# HOMEBREW_REPOSITORY == HOMEBREW_PREFIX, which is true on the test bots # HOMEBREW_REPOSITORY == HOMEBREW_PREFIX, which is true on the test bots
unless ENV["HOMEBREW_RUBY"] == "1.8.7" unless ENV["HOMEBREW_RUBY"] == "1.8.7"
@ -710,16 +710,19 @@ module Homebrew
end end
if ARGV.include? "--cleanup" if ARGV.include? "--cleanup"
test "git", "reset", "--hard" git "reset", "--hard", "origin/master"
git "stash", "pop" git "stash", "pop"
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 unless @repository == HOMEBREW_REPOSITORY
safe_system "git", "reset", "--hard" HOMEBREW_REPOSITORY.cd do
Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" } safe_system "git", "reset", "--hard"
safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/" safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
end
end end
Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" }
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"]