From 2b7824f7de4a5587112226edb466deabd04ba30a Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Fri, 2 Apr 2021 18:01:42 -0700 Subject: [PATCH] github_packages: Use hash compact --- Library/Homebrew/github_packages.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/github_packages.rb b/Library/Homebrew/github_packages.rb index b08a773538..302e2eea95 100644 --- a/Library/Homebrew/github_packages.rb +++ b/Library/Homebrew/github_packages.rb @@ -205,10 +205,7 @@ class GitHubPackages "org.opencontainers.image.url" => bottle_hash["formula"]["homepage"], "org.opencontainers.image.vendor" => org, "org.opencontainers.image.version" => version, - } - formula_annotations_hash.each do |key, value| - formula_annotations_hash.delete(key) if value.blank? - end + }.compact manifests = bottle_hash["bottle"]["tags"].map do |bottle_tag, tag_hash| local_file = tag_hash["local_filename"] @@ -272,10 +269,7 @@ class GitHubPackages "org.opencontainers.image.title" => "#{formula_full_name} #{tag}", "com.github.package.type" => GITHUB_PACKAGE_TYPE, "sh.brew.bottle.glibc.version" => glibc_version, - }).sort.to_h - annotations_hash.each do |key, value| - annotations_hash.delete(key) if value.blank? - end + }).compact.sort.to_h image_manifest = { schemaVersion: 2,