From 0bf491ba18e86e1935b0ca05af9be12e880c6b01 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Tue, 15 Sep 2020 13:36:45 +0200 Subject: [PATCH] pr-pull: don't require bintray credentials to be set It blocks uploading to GitHub Releases where Bintray credentials are not needed. Also those checks are already performed in `bintray.rb`. --- Library/Homebrew/dev-cmd/pr-pull.rb | 12 ++---------- docs/Manpage.md | 2 +- manpages/brew.1 | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index 0e46ebbbc3..6c5e867e85 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -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) diff --git a/docs/Manpage.md b/docs/Manpage.md index 531b47decb..c1c0870ebc 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -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`: diff --git a/manpages/brew.1 b/manpages/brew.1 index d9da1fb564..65c0f144cb 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -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