From 3141d493caf31264f7e88338a8749a7af59a2c45 Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Fri, 2 Apr 2021 10:13:27 +0100 Subject: [PATCH] github_packages: Rename sh.brew.bottle.digest Rename sh.brew.bottle.checksum to sh.brew.bottle.digest for consistency with the OCI descriptor spec. --- Library/Homebrew/github_packages.rb | 2 +- Library/Homebrew/software_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/github_packages.rb b/Library/Homebrew/github_packages.rb index 309efc6751..435ff366d6 100644 --- a/Library/Homebrew/github_packages.rb +++ b/Library/Homebrew/github_packages.rb @@ -287,7 +287,7 @@ class GitHubPackages platform: platform_hash, annotations: { "org.opencontainers.image.ref.name" => tag, - "sh.brew.bottle.checksum" => tar_gz_sha256, + "sh.brew.bottle.digest" => tar_gz_sha256, "sh.brew.tab" => tab.to_json, }, } diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 1cf353a6f1..79b0a8cc5a 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -370,9 +370,9 @@ class Bottle manifests_annotations = manifests.map { |m| m["annotations"] } raise ArgumentError, "Missing 'annotations' section." if manifests_annotations.blank? - bottle_checksum = @resource.checksum.hexdigest + bottle_digest = @resource.checksum.hexdigest manifest_annotations = manifests_annotations.find do |m| - m["sh.brew.bottle.checksum"] == bottle_checksum + m["sh.brew.bottle.digest"] == bottle_digest end raise ArgumentError, "Couldn't find manifest matching bottle checksum." if manifest_annotations.blank?