From 3e8c6c8e67b8296b013c535e6d46da6238345236 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 24 Oct 2014 13:56:57 +0100 Subject: [PATCH] brew-test-bot: start generalization of uploaders. --- Library/Homebrew/cmd/test-bot.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index d842c3780c..f38950842f 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"]