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

Merge pull request #7327 from issyl0/pull-deprecate-bottle

Browse Source 
pull: Deprecate `--bottle` flag
This commit is contained in:
Issy Long 2020-04-12 11:41:37 +01:00 committed by GitHub
commit c8867e5352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Library/Homebrew/dev-cmd/pull.rb
View File

@ -37,8 +37,6 @@ module Homebrew
Each <patch> may be the number of a pull request in `homebrew/core`, the URL of any pull request Each <patch> may be the number of a pull request in `homebrew/core`, the URL of any pull request
or commit on GitHub or a "https://jenkins.brew.sh/job/..." testing job URL. or commit on GitHub or a "https://jenkins.brew.sh/job/..." testing job URL.
EOS EOS
switch "--bottle",
description: "Handle bottles, pulling the bottle-update commit and publishing files on Bintray."
switch "--bump", switch "--bump",
description: "For one-formula PRs, automatically reword commit message to our preferred format." description: "For one-formula PRs, automatically reword commit message to our preferred format."
switch "--clean", switch "--clean",
@ -105,7 +103,6 @@ module Homebrew
end end
_, testing_job = *testing_match _, testing_job = *testing_match
url = "https://github.com/Homebrew/homebrew-#{tap.repo}/compare/master...BrewTestBot:testing-#{testing_job}" url = "https://github.com/Homebrew/homebrew-#{tap.repo}/compare/master...BrewTestBot:testing-#{testing_job}"
odie "--bottle is required for testing job URLs!" unless args.bottle?
elsif (api_match = arg.match HOMEBREW_PULL_API_REGEX) elsif (api_match = arg.match HOMEBREW_PULL_API_REGEX)
_, user, repo, issue = *api_match _, user, repo, issue = *api_match
url = "https://github.com/#{user}/#{repo}/pull/#{issue}" url = "https://github.com/#{user}/#{repo}/pull/#{issue}"
@ -117,7 +114,7 @@ module Homebrew
odie "Not a GitHub pull request or commit: #{arg}" odie "Not a GitHub pull request or commit: #{arg}"
end end
odie "No pull request detected!" if !testing_job && args.bottle? && issue.nil? odie "No pull request detected!" if !testing_job && issue.nil?
if tap if tap
tap.install unless tap.installed? tap.install unless tap.installed?
@ -176,25 +173,11 @@ module Homebrew
next next
end end
if f.stable next unless f.stable
stable_urls = [f.stable.url] + f.stable.mirrors
stable_urls.grep(%r{^https://dl.bintray.com/homebrew/mirror/}) do |mirror_url|
check_bintray_mirror(f.full_name, mirror_url)
end
end
if args.bottle? stable_urls = [f.stable.url] + f.stable.mirrors
if f.bottle_unneeded? stable_urls.grep(%r{^https://dl.bintray.com/homebrew/mirror/}) do |mirror_url|
ohai "#{f}: skipping unneeded bottle." check_bintray_mirror(f.full_name, mirror_url)
elsif f.bottle_disabled?
ohai "#{f}: skipping disabled bottle: #{f.bottle_disable_reason}"
else
fetch_bottles = true
end
else
next unless f.bottle_defined?
opoo "#{f.full_name} has a bottle: do you need to update it with --bottle?"
end end
end end

2
docs/Manpage.md
View File

@ -929,8 +929,6 @@ Each *`patch`* may be the number of a pull request in `homebrew/core`, the URL o
any pull request or commit on GitHub or a "https://jenkins.brew.sh/job/..." any pull request or commit on GitHub or a "https://jenkins.brew.sh/job/..."
testing job URL. testing job URL.
* `--bottle`:
Handle bottles, pulling the bottle-update commit and publishing files on Bintray.
* `--bump`: * `--bump`:
For one-formula PRs, automatically reword commit message to our preferred format. For one-formula PRs, automatically reword commit message to our preferred format.
* `--clean`: * `--clean`:

4
manpages/brew.1
View File

@ -1184,10 +1184,6 @@ Get a patch from a GitHub commit or pull request and apply it to Homebrew\. Opti
Each \fIpatch\fR may be the number of a pull request in \fBhomebrew/core\fR, the URL of any pull request or commit on GitHub or a "https://jenkins\.brew\.sh/job/\.\.\." testing job URL\. Each \fIpatch\fR may be the number of a pull request in \fBhomebrew/core\fR, the URL of any pull request or commit on GitHub or a "https://jenkins\.brew\.sh/job/\.\.\." testing job URL\.
. .
.TP .TP
\fB\-\-bottle\fR
Handle bottles, pulling the bottle\-update commit and publishing files on Bintray\.
.
.TP
\fB\-\-bump\fR \fB\-\-bump\fR
For one\-formula PRs, automatically reword commit message to our preferred format\. For one\-formula PRs, automatically reword commit message to our preferred format\.
. .