From f1f775b9aaa89b21522d481c4b07e6310dd94c95 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 14 Jul 2016 10:18:39 +0100 Subject: [PATCH] test-bot: remove .git from Jenkins GIT_URLs. --- Library/Homebrew/dev-cmd/test-bot.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index 34a5a537cc..1279924672 100644 --- a/Library/Homebrew/dev-cmd/test-bot.rb +++ b/Library/Homebrew/dev-cmd/test-bot.rb @@ -304,10 +304,11 @@ module Homebrew @url = ENV["ghprbPullLink"] @hash = nil test "git", "checkout", "origin/master" - elsif ENV["GIT_BRANCH"] && ENV["GIT_URL"] + elsif ENV["GIT_URL"] && ENV["GIT_BRANCH"] + git_url = ENV["GIT_URL"].chomp("/").chomp(".git") %r{origin/pr/(\d+)/(merge|head)} =~ ENV["GIT_BRANCH"] pr = $1 - @url = "#{ENV["GIT_URL"].chomp("/")}/pull/#{pr}" + @url = "#{git_url}/pull/#{pr}" @hash = nil # Use Travis CI pull-request variables for pull request jobs. elsif travis_pr