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

Travis: don't run cleanup at all.

Browse Source
This commit is contained in:
Mike McQuaid 2015-11-19 13:29:40 +00:00
parent 1a8f6388a6
commit 5388f8c8f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,7 +647,7 @@ 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["TRAVIS"] git "clean", "-ffdx"
pr_locks = "#{HOMEBREW_REPOSITORY}/.git/refs/remotes/*/pr/*/*.lock" pr_locks = "#{HOMEBREW_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
@ -880,7 +880,7 @@ module Homebrew
if ARGV.include?("--ci-master") || ARGV.include?("--ci-pr") \ if ARGV.include?("--ci-master") || ARGV.include?("--ci-pr") \
|| ARGV.include?("--ci-testing") || ARGV.include?("--ci-testing")
ARGV << "--cleanup" if ENV["JENKINS_HOME"] || ENV["TRAVIS"] ARGV << "--cleanup" if ENV["JENKINS_HOME"]
ARGV << "--junit" << "--local" ARGV << "--junit" << "--local"
end end
if ARGV.include? "--ci-master" if ARGV.include? "--ci-master"