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

pr-pull: don't pass dry_run everywhere

Browse Source
This commit is contained in:
Jonathan Chang 2020-04-11 19:26:32 +10:00
parent 5b775afedd
commit e974dce16e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,19 +67,19 @@ module Homebrew
end end
end end
def signoff!(pr, path: ".", dry_run: false) def signoff!(pr, path: ".")
message = Utils.popen_read "git", "-C", path, "log", "-1", "--pretty=%B" message = Utils.popen_read "git", "-C", path, "log", "-1", "--pretty=%B"
close_message = "Closes ##{pr}." close_message = "Closes ##{pr}."
message += "\n#{close_message}" unless message.include? close_message message += "\n#{close_message}" unless message.include? close_message
if dry_run if Homebrew.args.dry_run?
puts "git commit --amend --signoff -m $message" puts "git commit --amend --signoff -m $message"
else else
safe_system "git", "-C", path, "commit", "--amend", "--signoff", "--allow-empty", "-q", "-m", message safe_system "git", "-C", path, "commit", "--amend", "--signoff", "--allow-empty", "-q", "-m", message
end end
end end
def cherry_pick_pr!(pr, path: ".", dry_run: false) def cherry_pick_pr!(pr, path: ".")
if dry_run if Homebrew.args.dry_run?
puts <<~EOS puts <<~EOS
git fetch --force origin +refs/pull/#{pr}/head git fetch --force origin +refs/pull/#{pr}/head
git merge-base HEAD FETCH_HEAD git merge-base HEAD FETCH_HEAD
@ -145,10 +145,10 @@ module Homebrew
Dir.mktmpdir pr do |dir| Dir.mktmpdir pr do |dir|
cd dir do cd dir do
GitHub.fetch_artifact(user, repo, pr, dir, workflow_id: workflow, artifact_name: artifact) GitHub.fetch_artifact(user, repo, pr, dir, workflow_id: workflow, artifact_name: artifact)
cherry_pick_pr! pr, path: tap.path, dry_run: args.dry_run? cherry_pick_pr! pr, path: tap.path
signoff! pr, path: tap.path, dry_run: args.dry_run? unless args.clean? signoff! pr, path: tap.path unless args.clean?
if args.dry_run? if Homebrew.args.dry_run?
puts "brew bottle --merge --write #{Dir["*.json"].join " "}" puts "brew bottle --merge --write #{Dir["*.json"].join " "}"
else else
quiet_system "#{HOMEBREW_PREFIX}/bin/brew", "bottle", "--merge", "--write", *Dir["*.json"] quiet_system "#{HOMEBREW_PREFIX}/bin/brew", "bottle", "--merge", "--write", *Dir["*.json"]
@ -156,7 +156,7 @@ module Homebrew
next if args.no_upload? next if args.no_upload?
if args.dry_run? if Homebrew.args.dry_run?
puts "Upload bottles described by these JSON files to Bintray:\n #{Dir["*.json"].join("\n ")}" puts "Upload bottles described by these JSON files to Bintray:\n #{Dir["*.json"].join("\n ")}"
else else
bintray.upload_bottle_json Dir["*.json"], publish_package: !args.no_publish? bintray.upload_bottle_json Dir["*.json"], publish_package: !args.no_publish?