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

dev-cmd/pr-*: remove --commit-bottles-to-pr-branch

Browse Source 
This will be made the default by Homebrew/homebrew-core#127021.
Additionally, branch protection rules will make it so that attempting to
push to master will fail, so we may as well not have to carry this flag
around.
This commit is contained in:
Carlo Cabrera 2023-03-30 11:11:15 +08:00
parent f4ee196f90
commit 0314d73d67
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dev-cmd/pr-automerge.rb
View File

@ -74,7 +74,7 @@ module Homebrew
pr_urls << pr["html_url"]
end
publish_args = ["pr-publish", "--commit-bottles-to-pr-branch"]
publish_args = ["pr-publish"]
publish_args << "--tap=#{tap}" if tap
publish_args << "--workflow=#{args.workflow}" if args.workflow
publish_args << "--autosquash" if args.autosquash?

7
Library/Homebrew/dev-cmd/pr-publish.rb
View File

@ -16,8 +16,6 @@ module Homebrew
Publish bottles for a pull request with GitHub Actions.
Requires write access to the repository.
EOS
switch "--commit-bottles-to-pr-branch",
description: "Push bottle commits to the pull request branch."
switch "--autosquash",
description: "If supported on the target tap, automatically reformat and reword commits " \
"to our preferred format."
@ -50,9 +48,8 @@ module Homebrew
ref = args.branch || "master"
inputs = {
commit_bottles_to_pr_branch: args.commit_bottles_to_pr_branch?,
autosquash: args.autosquash?,
large_runner: args.large_runner?,
autosquash: args.autosquash?,
large_runner: args.large_runner?,
}
inputs[:message] = args.message if args.message.presence