From a3feb127122c5a8e28a4808a3dae496fa1c26666 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Fri, 2 Apr 2021 17:42:15 -0700
Subject: [PATCH] github_packages: Add sh.brew.bottle.glibc.version

---
 Library/Homebrew/github_packages.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/github_packages.rb b/Library/Homebrew/github_packages.rb
index 317814b62f..b08a773538 100644
--- a/Library/Homebrew/github_packages.rb
+++ b/Library/Homebrew/github_packages.rb
@@ -240,15 +240,15 @@ class GitHubPackages
       when "darwin"
         os_version || "macOS #{MacOS::Version.from_symbol(bottle_tag)}"
       when "linux"
-        glibc_version = tab["built_on"]["glibc_version"] if tab["built_on"].present?
-        os_version ||= "Ubuntu 16.04.7"
-        glibc_version ||= "2.23"
-        os_version = os_version.delete_suffix " LTS"
-        "#{os_version} glibc #{glibc_version}"
+        (os_version || "Ubuntu 16.04.7").delete_suffix " LTS"
       else
         os_version
       end
 
+      glibc_version = if os == "linux"
+        (tab["built_on"]["glibc_version"] if tab["built_on"].present?) || "2.23"
+      end
+
       platform_hash = {
         architecture: architecture,
         os: os,
@@ -271,6 +271,7 @@ class GitHubPackages
         "org.opencontainers.image.ref.name"      => tag,
         "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?
@@ -304,8 +305,9 @@ class GitHubPackages
         annotations: {
           "org.opencontainers.image.ref.name" => tag,
           "sh.brew.bottle.digest"             => tar_gz_sha256,
+          "sh.brew.bottle.glibc.version"      => glibc_version,
           "sh.brew.tab"                       => tab.to_json,
-        },
+        }.compact,
       }
     end