mirror of
https://github.com/Homebrew/brew.git
synced 2025-07-14 16:09:03 +08:00
Fix bottle block generation and audit for arm64 Linux
Before this change, `brew bottle` would add the `:arm64_linux` bottle lines last. This would make `brew style` complain because it wants the `arm64_*` bottles listed first. Let's fix this by retaining the existing style as closely as possible: - macOS bottles are listed first - for each OS, arm64 bottles are listed first (just as we do on macOS) In particular, `brew bottle` will now insert `:arm64_linux` bottle lines just above the `:x86_64_linux` bottle lines (but still below the macOS bottle lines). x86_64 may continue to be a more popular platform on Linux for quite some time. However, users looking for those bottles can continue to look in the same place as before this change (i.e., the last line of the bottle block). Taking this together with the consistency on macOS mentioned above, I think this is the right way forward here. For concreteness, here are some examples of bottle blocks before and after this change. Before this change, immediately after `brew bottle`: bottle do sha256 arm64_sequoia: "1a57e04052f4bae4172d546a7927c645fc29d2ef5fafbec19d08ee1dddc542fb" sha256 arm64_sonoma: "a58cf9af5d04d3d5709b5337f3793586087a79e178da51d1f3978c0c13b8cf34" sha256 ventura: "6d8b90b2cbb31dcb78394c6540f5454cd57232fc309921173814f880e63718f0" sha256 x86_64_linux: "cd5faac2834ba79e39429b9aac99e4f69d6e6023cbb1cbcd0b62e94cfc69bb2a" sha256 arm64_linux: "457d3e9bd0c287483e27f29a488a18c90e1f55be076fc49b07942ef396c419be" end Before this change, after doing `brew style --fix`: bottle do sha256 arm64_sequoia: "1a57e04052f4bae4172d546a7927c645fc29d2ef5fafbec19d08ee1dddc542fb" sha256 arm64_sonoma: "a58cf9af5d04d3d5709b5337f3793586087a79e178da51d1f3978c0c13b8cf34" sha256 arm64_linux: "457d3e9bd0c287483e27f29a488a18c90e1f55be076fc49b07942ef396c419be" sha256 ventura: "6d8b90b2cbb31dcb78394c6540f5454cd57232fc309921173814f880e63718f0" sha256 x86_64_linux: "cd5faac2834ba79e39429b9aac99e4f69d6e6023cbb1cbcd0b62e94cfc69bb2a" end After this change: bottle do sha256 arm64_sequoia: "1a57e04052f4bae4172d546a7927c645fc29d2ef5fafbec19d08ee1dddc542fb" sha256 arm64_sonoma: "a58cf9af5d04d3d5709b5337f3793586087a79e178da51d1f3978c0c13b8cf34" sha256 ventura: "6d8b90b2cbb31dcb78394c6540f5454cd57232fc309921173814f880e63718f0" sha256 arm64_linux: "457d3e9bd0c287483e27f29a488a18c90e1f55be076fc49b07942ef396c419be" sha256 x86_64_linux: "cd5faac2834ba79e39429b9aac99e4f69d6e6023cbb1cbcd0b62e94cfc69bb2a" end
This commit is contained in:
parent
2462e40ca5
commit
11827656a9
@ -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)
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user