Merge pull request #11497 from nandahkrishna/remove-publish-flag

`brew pr-{pull,upload}`: remove `--no-publish` flag

Library/Homebrew/dev-cmd/pr-pull.rb

@@ -20,12 +20,8 @@ module Homebrew
         pull request with artifacts generated by GitHub Actions.
         Requires write access to the repository.
       EOS
-      switch "--no-publish",
-             description: "Download the bottles, apply the bottle commit and "\
-                          "upload the bottles, but don't publish them."
       switch "--no-upload",
-             description: "Download the bottles and apply the bottle commit, "\
+             description: "Download the bottles but don't upload them."
-                          "but don't upload."
       switch "--no-commit",
              description: "Do not generate a new commit before uploading."
       switch "-n", "--dry-run",
@@ -406,7 +402,6 @@ module Homebrew
           upload_args << "--debug" if args.debug?
           upload_args << "--verbose" if args.verbose?
           upload_args << "--no-commit" if args.no_commit?
-          upload_args << "--no-publish" if args.no_publish?
           upload_args << "--dry-run" if args.dry_run?
           upload_args << "--keep-old" if args.keep_old?
           upload_args << "--warn-on-upload-failure" if args.warn_on_upload_failure?

Library/Homebrew/dev-cmd/pr-upload.rb

@@ -17,8 +17,6 @@ module Homebrew
       description <<~EOS
         Apply the bottle commit and publish bottles to a host.
       EOS
-      switch "--no-publish",
-             description: "Apply the bottle commit and upload the bottles, but don't publish them."
       switch "--keep-old",
              description: "If the formula specifies a rebuild version, " \
                           "attempt to preserve its value in the generated DSL."

completions/bash/brew

@@ -1558,7 +1558,6 @@ _brew_pr_pull() {
       --keep-old
       --message
       --no-commit
-      --no-publish
       --no-upload
       --quiet
       --resolve
@@ -1588,7 +1587,6 @@ _brew_pr_upload() {
       --help
       --keep-old
       --no-commit
-      --no-publish
       --quiet
       --root-url
       --root-url-using

completions/fish/brew.fish

@@ -1071,8 +1071,7 @@ __fish_brew_complete_arg 'pr-pull' -l ignore-missing-artifacts -d 'Comma-separat
 __fish_brew_complete_arg 'pr-pull' -l keep-old -d 'If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL'
 __fish_brew_complete_arg 'pr-pull' -l message -d 'Message to include when autosquashing revision bumps, deletions, and rebuilds'
 __fish_brew_complete_arg 'pr-pull' -l no-commit -d 'Do not generate a new commit before uploading'
-__fish_brew_complete_arg 'pr-pull' -l no-publish -d 'Download the bottles, apply the bottle commit and upload the bottles, but don\'t publish them'
+__fish_brew_complete_arg 'pr-pull' -l no-upload -d 'Download the bottles but don\'t upload them'
-__fish_brew_complete_arg 'pr-pull' -l no-upload -d 'Download the bottles and apply the bottle commit, but don\'t upload'
 __fish_brew_complete_arg 'pr-pull' -l quiet -d 'Make some output more quiet'
 __fish_brew_complete_arg 'pr-pull' -l resolve -d 'When a patch fails to apply, leave in progress and allow user to resolve, instead of aborting'
 __fish_brew_complete_arg 'pr-pull' -l root-url -d 'Use the specified URL as the root of the bottle\'s URL instead of Homebrew\'s default'
@@ -1092,7 +1091,6 @@ __fish_brew_complete_arg 'pr-upload' -l github-org -d 'Upload to the specified G
 __fish_brew_complete_arg 'pr-upload' -l help -d 'Show this message'
 __fish_brew_complete_arg 'pr-upload' -l keep-old -d 'If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL'
 __fish_brew_complete_arg 'pr-upload' -l no-commit -d 'Do not generate a new commit before uploading'
-__fish_brew_complete_arg 'pr-upload' -l no-publish -d 'Apply the bottle commit and upload the bottles, but don\'t publish them'
 __fish_brew_complete_arg 'pr-upload' -l quiet -d 'Make some output more quiet'
 __fish_brew_complete_arg 'pr-upload' -l root-url -d 'Use the specified URL as the root of the bottle\'s URL instead of Homebrew\'s default'
 __fish_brew_complete_arg 'pr-upload' -l root-url-using -d 'Use the specified download strategy class for downloading the bottle\'s URL instead of Homebrew\'s default'

completions/zsh/_brew

@@ -1316,8 +1316,7 @@ _brew_pr_pull() {
     '--keep-old[If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL]' \
     '--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \
     '--no-commit[Do not generate a new commit before uploading]' \
-    '--no-publish[Download the bottles, apply the bottle commit and upload the bottles, but don'\''t publish them]' \
+    '--no-upload[Download the bottles but don'\''t upload them]' \
-    '--no-upload[Download the bottles and apply the bottle commit, but don'\''t upload]' \
     '--quiet[Make some output more quiet]' \
     '--resolve[When a patch fails to apply, leave in progress and allow user to resolve, instead of aborting]' \
     '--root-url[Use the specified URL as the root of the bottle'\''s URL instead of Homebrew'\''s default]' \
@@ -1339,7 +1338,6 @@ _brew_pr_upload() {
     '--help[Show this message]' \
     '--keep-old[If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL]' \
     '--no-commit[Do not generate a new commit before uploading]' \
-    '--no-publish[Apply the bottle commit and upload the bottles, but don'\''t publish them]' \
     '--quiet[Make some output more quiet]' \
     '--root-url[Use the specified URL as the root of the bottle'\''s URL instead of Homebrew'\''s default]' \
     '--root-url-using[Use the specified download strategy class for downloading the bottle'\''s URL instead of Homebrew'\''s default]' \

docs/Manpage.md

@@ -1168,10 +1168,8 @@ Download and publish bottles, and apply the bottle commit from a
 pull request with artifacts generated by GitHub Actions.
 Requires write access to the repository.
 
-* `--no-publish`:
-  Download the bottles, apply the bottle commit and upload the bottles, but don't publish them.
 * `--no-upload`:
-  Download the bottles and apply the bottle commit, but don't upload.
+  Download the bottles but don't upload them.
 * `--no-commit`:
   Do not generate a new commit before uploading.
 * `-n`, `--dry-run`:
@@ -1211,8 +1209,6 @@ Requires write access to the repository.
 
 Apply the bottle commit and publish bottles to a host.
 
-* `--no-publish`:
-  Apply the bottle commit and upload the bottles, but don't publish them.
 * `--keep-old`:
   If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL.
 * `-n`, `--dry-run`:

manpages/brew.1

@@ -1632,12 +1632,8 @@ Target workflow filename (default: \fBpublish\-commit\-bottles\.yml\fR)\.
 Download and publish bottles, and apply the bottle commit from a pull request with artifacts generated by GitHub Actions\. Requires write access to the repository\.
 .
 .TP
-\fB\-\-no\-publish\fR
-Download the bottles, apply the bottle commit and upload the bottles, but don\'t publish them\.
-.
-.TP
 \fB\-\-no\-upload\fR
-Download the bottles and apply the bottle commit, but don\'t upload\.
+Download the bottles but don\'t upload them\.
 .
 .TP
 \fB\-\-no\-commit\fR
@@ -1711,10 +1707,6 @@ Comma\-separated list of workflows which can be ignored if they have not been ru
 Apply the bottle commit and publish bottles to a host\.
 .
 .TP
-\fB\-\-no\-publish\fR
-Apply the bottle commit and upload the bottles, but don\'t publish them\.
-.
-.TP
 \fB\-\-keep\-old\fR
 If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL\.
 .