admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

pull: support Jenkins "Homebrew Testing" jobs.

Browse Source
This commit is contained in:
Mike McQuaid 2015-07-03 10:59:53 +01:00
parent 310afba026
commit 33fa3bacf6
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/Homebrew/cmd/pull.rb
View File

@ -59,8 +59,12 @@ module Homebrew
ARGV.named.each do |arg| ARGV.named.each do |arg|
if arg.to_i > 0 if arg.to_i > 0
url = 'https://github.com/Homebrew/homebrew/pull/' + arg url = "https://github.com/Homebrew/homebrew/pull/#{arg}"
issue = arg issue = arg
elsif (testing_match = arg.match %r{brew.sh/job/Homebrew%20Testing/(\d+)/})
_, testing_job = *testing_match
url = "https://github.com/Homebrew/homebrew/compare/master...BrewTestBot:testing-#{testing_job}"
odie "Testing URLs require `--bottle`!" unless ARGV.include?('--bottle')
else else
if (api_match = arg.match HOMEBREW_PULL_API_REGEX) if (api_match = arg.match HOMEBREW_PULL_API_REGEX)
_, user, tap, pull = *api_match _, user, tap, pull = *api_match
@ -74,11 +78,11 @@ module Homebrew
issue = url_match[3] issue = url_match[3]
end end
if ARGV.include?("--bottle") && issue.nil? if !testing_job && ARGV.include?("--bottle") && issue.nil?
raise "No pull request detected!" raise "No pull request detected!"
end end
if tap_name = tap(url) if !testing_job && tap_name = tap(url)
user = url_match[1].downcase user = url_match[1].downcase
tap_dir = HOMEBREW_REPOSITORY/"Library/Taps/#{user}/homebrew-#{tap_name}" tap_dir = HOMEBREW_REPOSITORY/"Library/Taps/#{user}/homebrew-#{tap_name}"
safe_system "brew", "tap", "#{user}/#{tap_name}" unless tap_dir.exist? safe_system "brew", "tap", "#{user}/#{tap_name}" unless tap_dir.exist?
@ -150,14 +154,20 @@ module Homebrew
end end
if ARGV.include? "--bottle" if ARGV.include? "--bottle"
bottle_commit_url = if tap_name
"https://github.com/BrewTestBot/homebrew-#{tap_name}/compare/homebrew:master...pr-#{issue}" bottle_commit_url = if testing_job
bottle_branch = "testing-bottle-#{testing_job}"
url
else else
"https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}" bottle_branch = "pull-bottle-#{issue}"
if tap_name
"https://github.com/BrewTestBot/homebrew-#{tap_name}/compare/homebrew:master...pr-#{issue}"
else
"https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
end
end end
curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
bottle_branch = "pull-bottle-#{issue}"
safe_system "git", "checkout", "-B", bottle_branch, revision safe_system "git", "checkout", "-B", bottle_branch, revision
pull_url bottle_commit_url pull_url bottle_commit_url
safe_system "git", "rebase", branch safe_system "git", "rebase", branch