diff options
| author | Mike McQuaid | 2014-10-24 13:56:57 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-10-24 13:57:00 +0100 |
| commit | 3e8c6c8e67b8296b013c535e6d46da6238345236 (patch) | |
| tree | e214f3fa7b3af2105b6a9a29739ca329cbeb4a15 /Library/Homebrew | |
| parent | d8c34e83b751d8e0cd895985ea2a2cb3eba90d29 (diff) | |
| download | brew-3e8c6c8e67b8296b013c535e6d46da6238345236.tar.bz2 | |
brew-test-bot: start generalization of uploaders.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index d842c3780..f38950842 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -543,7 +543,7 @@ module Homebrew ENV['HOMEBREW_LOGS'] = "#{Dir.pwd}/logs" end - if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload' + if ARGV.include? '--ci-upload' or ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload' jenkins = ENV['JENKINS_HOME'] job = ENV['UPSTREAM_JOB_NAME'] id = ENV['UPSTREAM_BUILD_ID'] @@ -566,10 +566,7 @@ module Homebrew safe_system "git", "checkout", "-f", "master" safe_system "git", "reset", "--hard", "origin/master" safe_system "brew", "update" - - if ARGV.include? '--ci-pr-upload' - safe_system "brew", "pull", "--clean", pr - end + safe_system "brew", "pull", "--clean", pr if pr ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"] ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] |