Enable automerging of JLL packages

Author: DilumAluthge

Manifest.toml

@@ -26,12 +26,6 @@ git-tree-sha1 = "05916673a2627dd91b4969ff8ba6941bc85a960e"
 uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
 version = "0.6.0"
 
-[[ColorTypes]]
-deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "10050a24b09e8e41b951e9976b109871ce98d965"
-uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.8.0"
-
 [[DataAPI]]
 git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252"
 uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
@@ -58,19 +52,13 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
 [[FileIO]]
 deps = ["Pkg"]
-git-tree-sha1 = "6c976460b85527d22d979682222d36767d95e27f"
+git-tree-sha1 = "80c17c711c41416eb0ac68347dc036be68b37682"
 uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-version = "1.1.0"
+version = "1.2.0"
 
 [[FileWatching]]
 uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 
-[[FixedPointNumbers]]
-deps = ["Test"]
-git-tree-sha1 = "b8045033701c3b10bf2324d7203404be7aef88ba"
-uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
-version = "0.5.3"
-
 [[GitForge]]
 deps = ["Dates", "HTTP", "JSON2"]
 git-tree-sha1 = "4469573ba6e4c262ba3c3018de2166c063ec5c2d"
@@ -112,9 +100,9 @@ version = "1.0.0"
 
 [[JLD2]]
 deps = ["CodecZlib", "DataStructures", "FileIO", "Mmap", "Pkg", "Printf", "UUIDs"]
-git-tree-sha1 = "bce3df72340c8e03607b118028de22f3e3104f5d"
+git-tree-sha1 = "2c1a6d672f2b85a520d59e63851bc67226b06ba8"
 uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
-version = "0.1.8"
+version = "0.1.10"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -244,9 +232,9 @@ version = "1.1.0"
 
 [[RegistryTools]]
 deps = ["AutoHashEquals", "LibGit2", "Pkg", "UUIDs"]
-git-tree-sha1 = "a3b6433e9ae527443cdec10ea868d3b98a463c23"
+git-tree-sha1 = "f9333ef8731c656815f3cc52cf73e2d56c4de6f4"
 uuid = "d1eb7eb1-105f-429d-abf5-b0f65cb9e2c4"
-version = "1.0.0"
+version = "1.1.0"
 
 [[SHA]]
 uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
@@ -298,12 +286,6 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [[Unicode]]
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
-[[VT100]]
-deps = ["ColorTypes", "FixedPointNumbers", "REPL", "Test"]
-git-tree-sha1 = "b15606f470e02061183738dd8d6d3ad5e115ed76"
-uuid = "7774df62-37c0-5c21-b34d-f6d7f98f54bc"
-version = "0.3.2"
-
 [[WebSockets]]
 deps = ["Base64", "Dates", "Distributed", "HTTP", "Logging", "Random", "Sockets", "Test"]
 git-tree-sha1 = "13f763d38c7a05688938808b49cb29b18b60c8c8"

Project.toml

@@ -1,7 +1,7 @@
 name = "BinaryBuilder"
 uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae"
 authors = ["Elliot Saba <[email protected]>"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/AutoBuild.jl

@@ -3,6 +3,7 @@ import GitHub: gh_get_json, DEFAULT_API
 import SHA: sha256
 using Pkg.TOML, Dates
 using RegistryTools, Registrator
+import LibGit2
 
 """
     build_tarballs(ARGS, src_name, src_version, sources, script, platforms,
@@ -420,21 +421,38 @@ function download_sources(sources::Vector; verbose::Bool = false)
     return output_sources
 end
 
+function _registered_packages(registry_url::AbstractString)
+    tmp_dir = mktempdir()
+    atexit(() -> rm(tmp_dir; force = true, recursive = true))
+    registry_dir = joinpath(tmp_dir, "REGISTRY")
+    LibGit2.clone(registry_url, registry_dir)
+    registry = TOML.parsefile(joinpath(registry_dir, "Registry.toml"))
+    packages = Vector{String}(undef, 0)
+    for p in registry["packages"]
+        push!(packages, p[2]["name"])
+    end
+    rm(tmp_dir; force = true, recursive = true)
+    return packages
+end
+
+function _package_is_registered(registry_url::AbstractString,
+                                package::AbstractString)
+    registered_packages = _registered_packages(registry_url)
+    return package in registered_packages
+end
+
 function register_jll(name, build_version, dependencies;
                       deploy_repo="JuliaBinaryWrappers/$(name)_jll.jl",
                       code_dir=joinpath(Pkg.devdir(), "$(name)_jll"),
                       gh_auth=github_auth(;allow_anonymous=false),
                       gh_username=gh_get_json(DEFAULT_API, "/user"; auth=gh_auth)["login"])
-    # Create fork (if it does not already exist)
-    fork = GitHub.create_fork("JuliaRegistries/General"; auth=gh_auth)
-
     # Calculate tree hash of wrapper code
     wrapper_tree_hash = bytes2hex(Pkg.GitTools.tree_hash(code_dir))
 
     # Use RegistryTools to push up a new `General` branch with this JLL package registered within it
     # TODO: Update our fork periodically from upstream `General`.
     cache = RegistryTools.RegistryCache(joinpath(Pkg.depots1(), "registries_binarybuilder"))
-    registry_url = "https://$(gh_username):$(gh_auth.token)@github.com/$(gh_username)/General"
+    registry_url = "https://$(gh_username):$(gh_auth.token)@github.com/JuliaRegistries/General"
     cache.registries[registry_url] = Base.UUID("23338594-aafe-5451-b93e-139f81909106")
     project = Pkg.Types.Project(build_project_dict(name, build_version, dependencies))
     reg_branch = RegistryTools.register(
@@ -448,12 +466,19 @@ function register_jll(name, build_version, dependencies;
     if haskey(reg_branch.metadata, "error")
         @error(reg_branch.metadata["error"])
     else
+        upstream_registry_url = "https://github.com/JuliaRegistries/General"
+        name_jll = "$(name)_jll"
+        if _package_is_registered(upstream_registry_url, name_jll)
+            pr_title = "New version: $(name_jll) v$(build_version)"
+        else
+            pr_title = "New package: $(name_jll) v$(build_version)"
+        end
         # Open pull request against JuliaRegistries/General
         params = Dict(
             "base" => "master",
-            "head" => "$(gh_username):$(reg_branch.branch)",
+            "head" => "$(reg_branch.branch)",
             "maintainer_can_modify" => true,
-            "title" => "JLL Registration: $(deploy_repo)-v$(build_version)",
+            "title" => pr_title,
             "body" => """
             Autogenerated JLL package registration