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

Update GitHubPackages for new Tab implementation

Browse Source
This commit is contained in:
Douglas Eichelberger 2023-03-15 09:49:45 -07:00
parent 5a0cdaa749
commit ea65b7264a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/github_packages.rb
View File

@ -315,28 +315,28 @@ class GitHubPackages
tar_gz_sha256 = write_tar_gz(local_file, blobs)
tab = tag_hash["tab"]
architecture = TAB_ARCH_TO_PLATFORM_ARCHITECTURE[tab["arch"].presence || bottle_tag.arch.to_s]
raise TypeError, "unknown tab['arch']: #{tab["arch"]}" if architecture.blank?
architecture = TAB_ARCH_TO_PLATFORM_ARCHITECTURE[tab.arch.presence || bottle_tag.arch.to_s]
raise TypeError, "unknown tab.arch: #{tab.arch}" if architecture.blank?
os = if tab["built_on"].present? && tab["built_on"]["os"].present?
BUILT_ON_OS_TO_PLATFORM_OS[tab["built_on"]["os"]]
os = if tab["built_on"].present? && tab.built_on["os"].present?
BUILT_ON_OS_TO_PLATFORM_OS[tab.built_on["os"]]
elsif bottle_tag.linux?
"linux"
else
"darwin"
end
raise TypeError, "unknown tab['built_on']['os']: #{tab["built_on"]["os"]}" if os.blank?
raise TypeError, "unknown tab.built_on['os']: #{tab.built_on["os"]}" if os.blank?
os_version = tab["built_on"]["os_version"].presence if tab["built_on"].present?
os_version = tab.built_on["os_version"].presence if tab.built_on.present?
case os
when "darwin"
os_version ||= "macOS #{bottle_tag.to_macos_version}"
when "linux"
os_version&.delete_suffix!(" LTS")
os_version ||= OS::LINUX_CI_OS_VERSION
glibc_version = tab["built_on"]["glibc_version"].presence if tab["built_on"].present?
glibc_version = tab.built_on["glibc_version"].presence if tab.built_on.present?
glibc_version ||= OS::LINUX_GLIBC_CI_VERSION
cpu_variant = tab["oldest_cpu_family"] || Hardware::CPU::INTEL_64BIT_OLDEST_CPU.to_s
cpu_variant = tab.built_on&.(:[], "oldest_cpu_family") || Hardware::CPU::INTEL_64BIT_OLDEST_CPU.to_s
end
platform_hash = {