test-bot: remove .git from Jenkins GIT_URLs.

This commit is contained in:
Mike McQuaid 2016-07-14 10:18:39 +01:00
parent 2a61c84be3
commit f1f775b9aa

View File

@ -304,10 +304,11 @@ module Homebrew
@url = ENV["ghprbPullLink"] @url = ENV["ghprbPullLink"]
@hash = nil @hash = nil
test "git", "checkout", "origin/master" 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"] %r{origin/pr/(\d+)/(merge|head)} =~ ENV["GIT_BRANCH"]
pr = $1 pr = $1
@url = "#{ENV["GIT_URL"].chomp("/")}/pull/#{pr}" @url = "#{git_url}/pull/#{pr}"
@hash = nil @hash = nil
# Use Travis CI pull-request variables for pull request jobs. # Use Travis CI pull-request variables for pull request jobs.
elsif travis_pr elsif travis_pr