mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19522 from Homebrew/arm64-linux-bottle-blocks

Browse Source 
Fix bottle block generation and audit for arm64 Linux
This commit is contained in:
Carlo Cabrera 2025-03-18 09:37:31 +00:00 committed by GitHub
commit 9a62e88bda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/bottle_specification.rb
View File

@ -118,11 +118,12 @@ class BottleSpecification
tags = collector.tags.sort_by do |tag| tags = collector.tags.sort_by do |tag|
version = tag.to_macos_version version = tag.to_macos_version
# Give `arm64` bottles a higher priority so they are first. # Give `arm64` bottles a higher priority so they are first.
priority = (tag.arch == :arm64) ? 2 : 1 priority = (tag.arch == :arm64) ? 3 : 2
"#{priority}.#{version}_#{tag}" "#{priority}.#{version}_#{tag}"
rescue MacOSVersion::Error rescue MacOSVersion::Error
# Sort non-macOS tags below macOS tags. # Sort non-macOS tags below macOS tags, and arm64 tags before other tags.
"0.#{tag}" priority = (tag.arch == :arm64) ? 1 : 0
"#{priority}.#{tag}"
end end
tags.reverse.map do |tag| tags.reverse.map do |tag|
spec = collector.specification_for(tag) spec = collector.specification_for(tag)

25
Library/Homebrew/rubocops/bottle.rb
View File

@ -149,26 +149,35 @@ module RuboCop
end end
end end
arm64_nodes = [] arm64_macos_nodes = []
intel_nodes = [] intel_macos_nodes = []
arm64_linux_nodes = []
intel_linux_nodes = []
sha256_nodes.each do |node| sha256_nodes.each do |node|
version = sha256_bottle_tag node version = sha256_bottle_tag node
if version.to_s.start_with? "arm64" if version == :arm64_linux
arm64_nodes << node arm64_linux_nodes << node
elsif version.to_s.start_with?("arm64")
arm64_macos_nodes << node
elsif version.to_s.end_with?("_linux")
intel_linux_nodes << node
else else
intel_nodes << node intel_macos_nodes << node
end end
end end
return if sha256_order(sha256_nodes) == sha256_order(arm64_nodes + intel_nodes) sorted_nodes = arm64_macos_nodes + intel_macos_nodes + arm64_linux_nodes + intel_linux_nodes
return if sha256_order(sha256_nodes) == sha256_order(sorted_nodes)
offending_node(bottle_node) offending_node(bottle_node)
problem "ARM bottles should be listed before Intel bottles" do |corrector| problem "ARM bottles should be listed before Intel bottles" do |corrector|
lines = ["bottle do"] lines = ["bottle do"]
lines += non_sha256_nodes.map { |node| " #{node.source}" } lines += non_sha256_nodes.map { |node| " #{node.source}" }
lines += arm64_nodes.map { |node| " #{node.source}" } lines += arm64_macos_nodes.map { |node| " #{node.source}" }
lines += intel_nodes.map { |node| " #{node.source}" } lines += intel_macos_nodes.map { |node| " #{node.source}" }
lines += arm64_linux_nodes.map { |node| " #{node.source}" }
lines += intel_linux_nodes.map { |node| " #{node.source}" }
lines << " end" lines << " end"
corrector.replace(bottle_node.source_range, lines.join("\n")) corrector.replace(bottle_node.source_range, lines.join("\n"))
end end