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

Merge pull request #11036 from sjackman/sj/ghcr-compact

Browse Source 
GHCR: Use reject to remove empty hash values
This commit is contained in:
Mike McQuaid 2021-04-06 08:52:55 +01:00 committed by GitHub
commit 480d943035
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/github_packages.rb
View File

@ -206,8 +206,7 @@ class GitHubPackages
"org.opencontainers.image.url" => bottle_hash["formula"]["homepage"], "org.opencontainers.image.url" => bottle_hash["formula"]["homepage"],
"org.opencontainers.image.vendor" => org, "org.opencontainers.image.vendor" => org,
"org.opencontainers.image.version" => version, "org.opencontainers.image.version" => version,
} }.reject { |_, v| v.blank? }
delete_blank_hash_values(formula_annotations_hash)
manifests = bottle_hash["bottle"]["tags"].map do |bottle_tag, tag_hash| manifests = bottle_hash["bottle"]["tags"].map do |bottle_tag, tag_hash|
local_file = tag_hash["local_filename"] local_file = tag_hash["local_filename"]
@ -250,8 +249,7 @@ class GitHubPackages
architecture: architecture, architecture: architecture,
os: os, os: os,
"os.version" => os_version, "os.version" => os_version,
} }.reject { |_, v| v.blank? }
delete_blank_hash_values(platform_hash)
tar_sha256 = Digest::SHA256.hexdigest( tar_sha256 = Digest::SHA256.hexdigest(
Utils.safe_popen_read("gunzip", "--stdout", "--decompress", local_file), Utils.safe_popen_read("gunzip", "--stdout", "--decompress", local_file),
@ -270,8 +268,7 @@ class GitHubPackages
"sh.brew.bottle.digest" => tar_gz_sha256, "sh.brew.bottle.digest" => tar_gz_sha256,
"sh.brew.bottle.glibc.version" => glibc_version, "sh.brew.bottle.glibc.version" => glibc_version,
"sh.brew.tab" => tab.to_json, "sh.brew.tab" => tab.to_json,
} }.reject { |_, v| v.blank? }
delete_blank_hash_values(descriptor_annotations_hash)
annotations_hash = formula_annotations_hash.merge(descriptor_annotations_hash).merge( annotations_hash = formula_annotations_hash.merge(descriptor_annotations_hash).merge(
{ {
@ -279,8 +276,7 @@ class GitHubPackages
"org.opencontainers.image.documentation" => documentation, "org.opencontainers.image.documentation" => documentation,
"org.opencontainers.image.title" => "#{formula_full_name} #{tag}", "org.opencontainers.image.title" => "#{formula_full_name} #{tag}",
}, },
).sort.to_h ).reject { |_, v| v.blank? }.sort.to_h
delete_blank_hash_values(annotations_hash)
image_manifest = { image_manifest = {
schemaVersion: 2, schemaVersion: 2,
@ -388,10 +384,4 @@ class GitHubPackages
[sha256, json.size] [sha256, json.size]
end end
def delete_blank_hash_values(hash)
hash.each do |key, value|
hash.delete(key) if value.blank?
end
end
end end