Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pull: Deprecate --bottle flag #7327

Merged
merged 1 commit into from Apr 12, 2020
Merged

pull: Deprecate --bottle flag #7327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 5 additions & 22 deletions Library/Homebrew/dev-cmd/pull.rb
View file
Open in desktop
Expand Up @@ -37,8 +37,6 @@ def pull_args
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.
EOS
switch "--bottle",
description: "Handle bottles, pulling the bottle-update commit and publishing files on Bintray."
switch "--bump",
description: "For one-formula PRs, automatically reword commit message to our preferred format."
switch "--clean",
Expand Down Expand Up @@ -105,7 +103,6 @@ def pull
end
_, testing_job = *testing_match
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)
_, user, repo, issue = *api_match
url = "https://github.com/#{user}/#{repo}/pull/#{issue}"
Expand All @@ -117,7 +114,7 @@ def pull
odie "Not a GitHub pull request or commit: #{arg}"
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
tap.install unless tap.installed?
Expand Down Expand Up @@ -176,25 +173,11 @@ def pull
next
end

if 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?
if f.bottle_unneeded?
ohai "#{f}: skipping unneeded bottle."
elsif f.bottle_disabled?
ohai "#{f}: skipping disabled bottle: #{f.bottle_disable_reason}"
else
fetch_bottles = true
end
else
next unless f.bottle_defined?
next unless f.stable

opoo "#{f.full_name} has a bottle: do you need to update it with --bottle?"
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

Expand Down
2 changes: 0 additions & 2 deletions docs/Manpage.md
View file
Open in desktop
Expand Up @@ -927,8 +927,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/..."
testing job URL.

* `--bottle`:
Handle bottles, pulling the bottle-update commit and publishing files on Bintray.
* `--bump`:
For one-formula PRs, automatically reword commit message to our preferred format.
* `--clean`:
Expand Down
4 changes: 0 additions & 4 deletions manpages/brew.1
View file
Open in desktop
Expand Up @@ -1180,10 +1180,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\.
.
.TP
\fB\-\-bottle\fR
Handle bottles, pulling the bottle\-update commit and publishing files on Bintray\.
.
.TP
\fB\-\-bump\fR
For one\-formula PRs, automatically reword commit message to our preferred format\.
.
Expand Down