mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

pr-upload: add --no-commit flag

Browse Source
This commit is contained in:
Rylan Polster 2020-10-03 12:33:47 -04:00
parent 7af967de83
commit 1fe9370b38
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/dev-cmd/pr-upload.rb
View File

@ -20,6 +20,8 @@ module Homebrew
"attempt to preserve its value in the generated DSL."
switch "-n", "--dry-run",
description: "Print what would be done rather than doing it."
switch "--no-commit",
description: "Do not generate a new commit before uploading."
switch "--warn-on-upload-failure",
description: "Warn instead of raising an error if the bottle upload fails. "\
"Useful for repairing bottle uploads that previously failed."
@ -66,6 +68,7 @@ module Homebrew
bottle_args << "--debug" if args.debug?
bottle_args << "--keep-old" if args.keep_old?
bottle_args << "--root-url=#{args.root_url}" if args.root_url
bottle_args << "--no-commit" if args.no_commit?
bottle_args += json_files
if args.dry_run?

4
docs/Common-Issues-for-Core-Contributors.md
View File

@ -9,6 +9,10 @@ This is a page for maintainers to diagnose certain build errors.
### Bottle publishes failed but the commits are correct in the git history
Follow these steps to fix this issue:
* Download and extract the bottle artifact.
* `brew pr-upload --no-commit` in the bottle directory.
Alternative instructions using `pr-pull`:
* `git reset --hard <SHA>` in homebrew/core to reset to the commit before before all the commits created by `brew pr-pull`.
* `brew pr-pull <options>` to upload the right bottles. Add the `--warn-on-upload-failure` flag if the bottles have been partially uploaded and you're certain that the bottle checksums will match the checksums already present in the `bottle do` block of the formula.
* `git reset --hard origin/master` to return to the latest commit and discard the commits made by `brew pr-pull`.

2
docs/Manpage.md
View File

@ -1177,6 +1177,8 @@ Apply the bottle commit and publish bottles to Bintray or GitHub Releases.
If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL.
* `-n`, `--dry-run`:
Print what would be done rather than doing it.
* `--no-commit`:
Do not generate a new commit before uploading.
* `--warn-on-upload-failure`:
Warn instead of raising an error if the bottle upload fails. Useful for repairing bottle uploads that previously failed.
* `--bintray-org`:

4
manpages/brew.1
View File

@ -1674,6 +1674,10 @@ If the formula specifies a rebuild version, attempt to preserve its value in the
Print what would be done rather than doing it\.
.
.TP
\fB\-\-no\-commit\fR
Do not generate a new commit before uploading\.
.
.TP
\fB\-\-warn\-on\-upload\-failure\fR
Warn instead of raising an error if the bottle upload fails\. Useful for repairing bottle uploads that previously failed\.
.