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

github_packages: adjust rebuild handling

Browse Source
This commit is contained in:
Shaun Jackman 2021-04-01 13:27:34 +01:00 committed by Mike McQuaid
parent 4f57adf42f
commit 95b44eab49
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/github_packages.rb
View File

@ -68,10 +68,18 @@ class GitHubPackages
end end
end end
def self.version_rebuild(version, rebuild) def self.version_rebuild(version, rebuild, bottle_tag = nil)
return version.to_s unless rebuild.to_i.positive? bottle_tag = (".#{bottle_tag}" if bottle_tag.present?)
"#{version}.#{rebuild}" rebuild = if rebuild.to_i.positive?
if bottle_tag
".#{rebuild}"
else
"-#{rebuild}"
end
end
"#{version}#{bottle_tag}#{rebuild}"
end end
def self.repo_without_prefix(repo) def self.repo_without_prefix(repo)
@ -222,8 +230,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
rebuild = ".#{rebuild}" if rebuild.to_i.positive? tag = GitHubPackages.version_rebuild(version, rebuild, bottle_tag)
tag = "#{version}.#{bottle_tag}#{rebuild}"
annotations_hash = formula_annotations_hash.merge({ annotations_hash = formula_annotations_hash.merge({
"org.opencontainers.image.created" => created_date, "org.opencontainers.image.created" => created_date,