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

Merge pull request #11083 from Bo98/ghp-bottle-tag

Browse Source 
github_packages: fix bottle tag handling
This commit is contained in:
Bo Anderson 2021-04-09 02:25:38 +01:00 committed by GitHub
commit bf0f38c72b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/github_packages.rb
View File

@ -269,24 +269,20 @@ class GitHubPackages
}.reject { |_, v| v.blank? } }.reject { |_, v| v.blank? }
manifests = bottle_hash["bottle"]["tags"].map do |bottle_tag, tag_hash| manifests = bottle_hash["bottle"]["tags"].map do |bottle_tag, tag_hash|
bottle_tag = Utils::Bottles::Tag.from_symbol(bottle_tag.to_sym)
local_file = tag_hash["local_filename"] local_file = tag_hash["local_filename"]
odebug "Uploading #{local_file}" odebug "Uploading #{local_file}"
tar_gz_sha256 = write_tar_gz(local_file, blobs) tar_gz_sha256 = write_tar_gz(local_file, blobs)
tab = tag_hash["tab"] tab = tag_hash["tab"]
architecture = if tab["arch"].present? architecture = TAB_ARCH_TO_PLATFORM_ARCHITECTURE[tab["arch"].presence || bottle_tag.arch.to_s]
TAB_ARCH_TO_PLATFORM_ARCHITECTURE[tab["arch"]]
elsif bottle_tag.to_s.start_with?("arm64")
"arm64"
else
"amd64"
end
raise TypeError, "unknown tab['arch']: #{tab["arch"]}" if architecture.blank? raise TypeError, "unknown tab['arch']: #{tab["arch"]}" if architecture.blank?
os = if tab["built_on"].present? && tab["built_on"]["os"].present? os = if tab["built_on"].present? && tab["built_on"]["os"].present?
BUILT_ON_OS_TO_PLATFORM_OS[tab["built_on"]["os"]] BUILT_ON_OS_TO_PLATFORM_OS[tab["built_on"]["os"]]
elsif bottle_tag.to_s.end_with?("_linux") elsif bottle_tag.linux?
"linux" "linux"
else else
"darwin" "darwin"
@ -296,7 +292,7 @@ class GitHubPackages
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 case os
when "darwin" when "darwin"
os_version ||= "macOS #{MacOS::Version.from_symbol(bottle_tag)}" os_version ||= "macOS #{bottle_tag.to_macos_version}"
when "linux" when "linux"
os_version&.delete_suffix!(" LTS") os_version&.delete_suffix!(" LTS")
os_version ||= OS::CI_OS_VERSION os_version ||= OS::CI_OS_VERSION
@ -320,7 +316,7 @@ class GitHubPackages
formulae_dir = tag_hash["formulae_brew_sh_path"] formulae_dir = tag_hash["formulae_brew_sh_path"]
documentation = "https://formulae.brew.sh/#{formulae_dir}/#{formula_name}" if formula_core_tap documentation = "https://formulae.brew.sh/#{formulae_dir}/#{formula_name}" if formula_core_tap
tag = GitHubPackages.version_rebuild(version, rebuild, bottle_tag) tag = GitHubPackages.version_rebuild(version, rebuild, bottle_tag.to_s)
descriptor_annotations_hash = { descriptor_annotations_hash = {
"org.opencontainers.image.ref.name" => tag, "org.opencontainers.image.ref.name" => tag,