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

pr-pull: don't require bintray credentials to be set

Browse Source 
It blocks uploading to GitHub Releases where Bintray credentials are not needed.
Also those checks are already performed in `bintray.rb`.
This commit is contained in:
Dawid Dziurla 2020-09-15 13:36:45 +02:00
parent 14741e3681
commit 0bf491ba18
No known key found for this signature in database
GPG Key ID: 7B6D8368172E9B0B
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/dev-cmd/pr-pull.rb
View File

@ -4,7 +4,6 @@ require "download_strategy"
require "cli/parser"
require "utils/github"
require "tmpdir"
require "bintray"
require "formula"
module Homebrew
@ -24,7 +23,7 @@ module Homebrew
"upload the bottles to Bintray, but don't publish them."
switch "--no-upload",
description: "Download the bottles and apply the bottle commit, "\
"but don't upload to Bintray."
"but don't upload to Bintray or GitHub Releases."
switch "-n", "--dry-run",
description: "Print what would be done rather than doing it."
switch "--clean",
@ -211,16 +210,9 @@ module Homebrew
def pr_pull
args = pr_pull_args.parse
bintray_user = ENV["HOMEBREW_BINTRAY_USER"]
bintray_key = ENV["HOMEBREW_BINTRAY_KEY"]
bintray_org = args.bintray_org || "homebrew"
if (bintray_user.blank? || bintray_key.blank?) && !args.dry_run? && !args.no_upload?
odie "Missing HOMEBREW_BINTRAY_USER or HOMEBREW_BINTRAY_KEY variables!"
end
workflow = args.workflow || "tests.yml"
artifact = args.artifact || "bottles"
bintray_org = args.bintray_org || "homebrew"
mirror_repo = args.bintray_mirror || "mirror"
tap = Tap.fetch(args.tap || CoreTap.instance.name)

2
docs/Manpage.md
View File

@ -1085,7 +1085,7 @@ Requires write access to the repository.
* `--no-publish`:
Download the bottles, apply the bottle commit and upload the bottles to Bintray, but don't publish them.
* `--no-upload`:
Download the bottles and apply the bottle commit, but don't upload to Bintray.
Download the bottles and apply the bottle commit, but don't upload to Bintray or GitHub Releases.
* `-n`, `--dry-run`:
Print what would be done rather than doing it.
* `--clean`:

2
manpages/brew.1
View File

@ -1496,7 +1496,7 @@ Download the bottles, apply the bottle commit and upload the bottles to Bintray,
.
.TP
\fB\-\-no\-upload\fR
Download the bottles and apply the bottle commit, but don\'t upload to Bintray\.
Download the bottles and apply the bottle commit, but don\'t upload to Bintray or GitHub Releases\.
.
.TP
\fB\-n\fR, \fB\-\-dry\-run\fR