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

Merge pull request #11235 from MikeMcQuaid/pr_upload_json_files

Browse Source 
dev-cmd/pr-upload: fix json_files handling.
This commit is contained in:
Mike McQuaid 2021-04-23 14:48:19 +01:00 committed by GitHub
commit f688d7adf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,9 +84,9 @@ module Homebrew
end end
end end
def bottles_hash_from_json_files(root_url) def json_files_and_bottles_hash_(root_url)
json_files = Dir["*.bottle.json"] json_files = Dir["*.bottle.json"]
odie "No bottle JSON files found in the current working directory" if json_files.empty? odie "No bottle JSON files found in the current working directory" if json_files.blank?
bottles_hash = json_files.reduce({}) do |hash, json_file| bottles_hash = json_files.reduce({}) do |hash, json_file|
hash.deep_merge(JSON.parse(File.read(json_file))) hash.deep_merge(JSON.parse(File.read(json_file)))
@ -98,13 +98,13 @@ module Homebrew
end end
end end
bottles_hash [json_files, bottles_hash]
end end
def pr_upload def pr_upload
args = pr_upload_args.parse args = pr_upload_args.parse
bottles_hash = bottles_hash_from_json_files(args.root_url) json_files, bottles_hash = json_files_and_bottles_hash_(args.root_url)
bottle_args = ["bottle", "--merge", "--write"] bottle_args = ["bottle", "--merge", "--write"]
bottle_args << "--verbose" if args.verbose? bottle_args << "--verbose" if args.verbose?
@ -145,7 +145,7 @@ module Homebrew
# Reload the JSON files (in case `brew bottle --merge` generated # Reload the JSON files (in case `brew bottle --merge` generated
# `all: $SHA256` bottles) # `all: $SHA256` bottles)
bottles_hash = bottles_hash_from_json_files(args.root_url) _, bottles_hash = json_files_and_bottles_hash_(args.root_url)
# Check the bottle commits did not break `brew audit` # Check the bottle commits did not break `brew audit`
unless args.no_commit? unless args.no_commit?