diff options
| author | Mike McQuaid | 2016-07-14 10:18:39 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-07-14 10:18:39 +0100 |
| commit | f1f775b9aaa89b21522d481c4b07e6310dd94c95 (patch) | |
| tree | 0aad9510fbe3905da7a65cf129d7e1c58736d495 | |
| parent | 2a61c84be38866c5be788eebea932510608ba805 (diff) | |
| download | brew-f1f775b9aaa89b21522d481c4b07e6310dd94c95.tar.bz2 | |
test-bot: remove .git from Jenkins GIT_URLs.
| -rw-r--r-- | Library/Homebrew/dev-cmd/test-bot.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index 34a5a537c..127992467 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 |