From e5346d8aacdfa80f37c6e8839d4e6d9c2286d115 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 28 Jul 2023 00:43:30 +0100 Subject: [PATCH 1/2] keg_relocate: fix all text files being marked as changed --- Library/Homebrew/keg_relocate.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb index 59ffeab115..bbb2f87d9b 100644 --- a/Library/Homebrew/keg_relocate.rb +++ b/Library/Homebrew/keg_relocate.rb @@ -34,7 +34,7 @@ class Keg @replacement_map.fetch(key) end - sig { params(text: String).void } + sig { params(text: String).returns(T::Boolean) } def replace_text(text) replacements = @replacement_map.values.to_h @@ -47,7 +47,7 @@ class Keg changed = text.gsub!(key, replacements[key]) any_changed ||= changed end - any_changed + !any_changed.nil? end sig { params(path: T.any(String, Regexp)).returns(Regexp) } From 599f7af505e0c70ebb3fdc8c375015813d53ea40 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 28 Jul 2023 00:43:57 +0100 Subject: [PATCH 2/2] github_packages: abort with an error if image index is >= 4MB --- Library/Homebrew/github_packages.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/github_packages.rb b/Library/Homebrew/github_packages.rb index 39625162c5..bc74d0fab2 100644 --- a/Library/Homebrew/github_packages.rb +++ b/Library/Homebrew/github_packages.rb @@ -424,6 +424,7 @@ class GitHubPackages end index_json_sha256, index_json_size = write_image_index(manifests, blobs, formula_annotations_hash) + raise "Image index too large!" if index_json_size >= 4 * 1024 * 1024 # GitHub will error 500 if too large write_index_json(index_json_sha256, index_json_size, root, "org.opencontainers.image.ref.name" => version_rebuild)