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 #17532 from Homebrew/revert-17529-revert-17518-revert-17517-revert-17507-path_exec_files

Browse Source
This commit is contained in:
Mike McQuaid 2024-06-20 05:49:03 +02:00 committed by GitHub
commit 3cfe8e7a80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -628,6 +628,17 @@ module Homebrew
return unless args.json? return unless args.json?
if keg
keg_prefix = "#{keg}/"
path_exec_files = [keg/"bin", keg/"sbin"].select(&:exist?)
.flat_map(&:children)
.select(&:executable?)
.map { |path| path.to_s.delete_prefix(keg_prefix) }
all_files = keg.find
.select(&:file?)
.map { |path| path.to_s.delete_prefix(keg_prefix) }
end
json = { json = {
formula.full_name => { formula.full_name => {
"formula" => { "formula" => {
@ -656,6 +667,8 @@ module Homebrew
"local_filename" => filename.to_s, "local_filename" => filename.to_s,
"sha256" => sha256, "sha256" => sha256,
"tab" => tab.to_bottle_hash, "tab" => tab.to_bottle_hash,
"path_exec_files" => path_exec_files,
"all_files" => all_files,
}, },
}, },
}, },

7
Library/Homebrew/github_packages.rb
View File

@ -384,6 +384,10 @@ class GitHubPackages
local_file_size = File.size(local_file) local_file_size = File.size(local_file)
path_exec_files_string = if (path_exec_files = tag_hash["path_exec_files"].presence)
path_exec_files.join(",")
end
descriptor_annotations_hash = { descriptor_annotations_hash = {
"org.opencontainers.image.ref.name" => tag, "org.opencontainers.image.ref.name" => tag,
"sh.brew.bottle.cpu.variant" => cpu_variant, "sh.brew.bottle.cpu.variant" => cpu_variant,
@ -391,8 +395,11 @@ class GitHubPackages
"sh.brew.bottle.glibc.version" => glibc_version, "sh.brew.bottle.glibc.version" => glibc_version,
"sh.brew.bottle.size" => local_file_size.to_s, "sh.brew.bottle.size" => local_file_size.to_s,
"sh.brew.tab" => tab.to_json, "sh.brew.tab" => tab.to_json,
"sh.brew.path_exec_files" => path_exec_files_string,
}.compact_blank }.compact_blank
# TODO: upload/add tag_hash["all_files"] somewhere.
annotations_hash = formula_annotations_hash.merge(descriptor_annotations_hash).merge( annotations_hash = formula_annotations_hash.merge(descriptor_annotations_hash).merge(
{ {
"org.opencontainers.image.created" => created_date, "org.opencontainers.image.created" => created_date,