From 0314d73d67655c0a9e2aeebb7a45364eb3064fb8 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Thu, 30 Mar 2023 11:11:15 +0800 Subject: [PATCH] dev-cmd/pr-*: remove `--commit-bottles-to-pr-branch` 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. --- Library/Homebrew/dev-cmd/pr-automerge.rb | 2 +- Library/Homebrew/dev-cmd/pr-publish.rb | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb index 04c92ec374a26..87c54ca5180c9 100644 --- a/Library/Homebrew/dev-cmd/pr-automerge.rb +++ b/Library/Homebrew/dev-cmd/pr-automerge.rb @@ -74,7 +74,7 @@ def pr_automerge 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? diff --git a/Library/Homebrew/dev-cmd/pr-publish.rb b/Library/Homebrew/dev-cmd/pr-publish.rb index 1655121f5f3fe..c6c64dd1aa852 100644 --- a/Library/Homebrew/dev-cmd/pr-publish.rb +++ b/Library/Homebrew/dev-cmd/pr-publish.rb @@ -16,8 +16,6 @@ def pr_publish_args 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 @@ def pr_publish 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