From a094dbe2bbfa50a171de837fcad53ef50e819b3c Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 24 Oct 2014 14:27:01 +0100 Subject: [PATCH] brew-test-bot: just use ci-upload flag. Can combine testing and PR upload jobs into a single one. --- Library/Homebrew/cmd/test-bot.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index f38950842f..742fda12db 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -18,8 +18,7 @@ # --ci-master: Shortcut for Homebrew master branch CI options. # --ci-pr: Shortcut for Homebrew pull request CI options. # --ci-testing: Shortcut for Homebrew testing CI options. -# --ci-pr-upload: Homebrew CI pull request bottle upload. -# --ci-testing-upload: Homebrew CI testing bottle upload. +# --ci-upload: Homebrew CI bottle upload. require 'formula' require 'utils' @@ -543,7 +542,7 @@ module Homebrew ENV['HOMEBREW_LOGS'] = "#{Dir.pwd}/logs" end - if ARGV.include? '--ci-upload' or ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload' + if ARGV.include? '--ci-upload' jenkins = ENV['JENKINS_HOME'] job = ENV['UPSTREAM_JOB_NAME'] id = ENV['UPSTREAM_BUILD_ID']