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

github_packages: add helper class methods.

Browse Source
This commit is contained in:
Mike McQuaid 2021-03-31 20:22:04 +01:00
parent 7b9b9e16ec
commit a50ec38d31
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Library/Homebrew/github_packages.rb
View File

@ -68,6 +68,24 @@ class GitHubPackages
end end
end end
def self.version_rebuild(version, rebuild)
return version.to_s unless rebuild.to_i.positive?
"#{version}.#{rebuild}"
end
def self.repo_without_prefix(repo)
# remove redundant repo prefix for a shorter name
repo.delete_prefix("homebrew-")
end
def self.root_url(org, repo, prefix = URL_PREFIX)
# docker/skopeo insist on lowercase org ("repository name")
org = org.downcase
"#{prefix}#{org}/#{repo_without_prefix(repo)}"
end
private private
IMAGE_CONFIG_SCHEMA_URI = "https://opencontainers.org/schema/image/config" IMAGE_CONFIG_SCHEMA_URI = "https://opencontainers.org/schema/image/config"
@ -138,10 +156,8 @@ class GitHubPackages
repo = "homebrew-#{repo}" unless HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX.match?(repo) repo = "homebrew-#{repo}" unless HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX.match?(repo)
version = bottle_hash["formula"]["pkg_version"] version = bottle_hash["formula"]["pkg_version"]
rebuild = if (rebuild = bottle_hash["bottle"]["rebuild"]).positive? rebuild = bottle_hash["bottle"]["rebuild"]
".#{rebuild}" version_rebuild = GitHubPackages.version_rebuild(version, rebuild)
end
version_rebuild = "#{version}#{rebuild}"
root = Pathname("#{formula_name}--#{version_rebuild}") root = Pathname("#{formula_name}--#{version_rebuild}")
FileUtils.rm_rf root FileUtils.rm_rf root
@ -205,6 +221,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 = "#{version}.#{bottle_tag}#{rebuild}" tag = "#{version}.#{bottle_tag}#{rebuild}"
annotations_hash = formula_annotations_hash.merge({ annotations_hash = formula_annotations_hash.merge({
@ -255,11 +272,8 @@ class GitHubPackages
write_index_json(index_json_sha256, index_json_size, root, write_index_json(index_json_sha256, index_json_size, root,
"org.opencontainers.image.ref.name" => version_rebuild) "org.opencontainers.image.ref.name" => version_rebuild)
# docker/skopeo insist on lowercase org ("repository name") image_tag = "#{GitHubPackages.root_url(org, repo, DOCKER_PREFIX)}/#{formula_name}:#{version_rebuild}"
org_prefix = "#{DOCKER_PREFIX}#{org.downcase}"
# remove redundant repo prefix for a shorter name
package_name = "#{repo.delete_prefix("homebrew-")}/#{formula_name}"
image_tag = "#{org_prefix}/#{package_name}:#{version_rebuild}"
puts puts
args = ["copy", "--all", "oci:#{root}", image_tag.to_s] args = ["copy", "--all", "oci:#{root}", image_tag.to_s]
if dry_run if dry_run
@ -267,6 +281,7 @@ class GitHubPackages
else else
args << "--dest-creds=#{user}:#{token}" args << "--dest-creds=#{user}:#{token}"
system_command!(skopeo, verbose: true, print_stdout: true, args: args) system_command!(skopeo, verbose: true, print_stdout: true, args: args)
package_name = "#{GitHubPackages.repo_without_prefix(repo)}/#{formula_name}"
ohai "Uploaded to https://github.com/orgs/Homebrew/packages/container/package/#{package_name}" ohai "Uploaded to https://github.com/orgs/Homebrew/packages/container/package/#{package_name}"
end end
end end