From 358fd0ca19ea65e82577a1ff58f51793a9e9b56f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 16 Oct 2014 21:42:53 +0100 Subject: [PATCH] brew-test-bot: use Jenkins PR plugin provided URL. --- Library/Homebrew/cmd/test-bot.rb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 81d8c46871..f2d28a21e5 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -222,7 +222,7 @@ module Homebrew # Use Jenkins environment variables if present. if no_args? and ENV['GIT_PREVIOUS_COMMIT'] and ENV['GIT_COMMIT'] \ - and not ENV['ghprbPullId'] + and not ENV['ghprbPullLink'] diff_start_sha1 = shorten_revision ENV['GIT_PREVIOUS_COMMIT'] diff_end_sha1 = shorten_revision ENV['GIT_COMMIT'] test "brew", "update" if current_branch == "master" @@ -233,18 +233,7 @@ module Homebrew end # Handle Jenkins pull request builder plugin. - if ENV['ghprbPullId'] and ENV['GIT_URL'] - git_url = ENV['GIT_URL'] - git_match = git_url.match %r{.*github.com[:/](\w+/\w+).*} - if git_match - github_repo = git_match[1] - pull_id = ENV['ghprbPullId'] - @url = "https://github.com/#{github_repo}/pull/#{pull_id}" - @hash = nil - else - puts "Invalid 'ghprbPullId' environment variable value!" - end - end + @url = ENV['ghprbPullLink'] if ENV['ghprbPullLink'] if no_args? if diff_start_sha1 == diff_end_sha1 or \