github_packages: tweak package name and output URL

This commit is contained in:
Mike McQuaid 2021-03-29 14:37:51 +01:00
parent 725f2828b4
commit 7f1ac4cdae
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70

View File

@ -126,9 +126,6 @@ class GitHubPackages
_, org, repo, = *bottle_hash["bottle"]["root_url"].match(URL_REGEX) _, org, repo, = *bottle_hash["bottle"]["root_url"].match(URL_REGEX)
# docker/skopeo insist on lowercase org ("repository name")
org = org.downcase
version = bottle_hash["formula"]["pkg_version"] version = bottle_hash["formula"]["pkg_version"]
rebuild = if (rebuild = bottle_hash["bottle"]["rebuild"]).positive? rebuild = if (rebuild = bottle_hash["bottle"]["rebuild"]).positive?
".#{rebuild}" ".#{rebuild}"
@ -255,13 +252,17 @@ class GitHubPackages
write_index_json(index_json_sha256, index_json_size, root) write_index_json(index_json_sha256, index_json_size, root)
image = "#{URL_DOMAIN}/#{org}/#{repo}/#{formula_name}" # docker/skopeo insist on lowercase org ("repository name")
image_tag = "#{image}:#{version_rebuild}" org_prefix = "#{URL_DOMAIN}/#{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
system_command!(skopeo, verbose: true, print_stdout: true, args: [ system_command!(skopeo, verbose: true, print_stdout: true, args: [
"copy", "--dest-creds=#{user}:#{token}", "copy", "--dest-creds=#{user}:#{token}",
"oci:#{root}", "docker://#{image_tag}" "oci:#{root}", "docker://#{image_tag}"
]) ])
ohai "Uploaded to https://github.com/orgs/Homebrew/packages/container/package/#{package_name}"
end end
def write_image_layout(root) def write_image_layout(root)