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

test-bot: clean harder if first clean fails.

Browse Source
This commit is contained in:
Mike McQuaid 2014-12-28 18:17:12 +00:00
parent af4a156885
commit 8c19b2a13e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,7 +475,8 @@ module Homebrew
git "rebase", "--abort" git "rebase", "--abort"
git "reset", "--hard" git "reset", "--hard"
git "checkout", "-f", "master" git "checkout", "-f", "master"
git "clean", "--force", "-dx" git "clean", "-fdx"
# TODO: on failure rerun with: -ffdx
end end
def cleanup_after def cleanup_after
@ -483,7 +484,8 @@ module Homebrew
checkout_args = [] checkout_args = []
if ARGV.include? '--cleanup' if ARGV.include? '--cleanup'
test "git", "clean", "--force", "-dx" test "git", "clean", "-fdx"
test "git", "clean", "-ffdx" if steps.last.failed?
checkout_args << "-f" checkout_args << "-f"
end end