[AutoBuild] Add revision on Yggdrasil to the registration PR (#993)

Author: giordano

src/AutoBuild.jl

@@ -2,7 +2,7 @@ export build_tarballs, autobuild, print_artifacts_toml, build, get_meta_json
 import GitHub: gh_get_json, DEFAULT_API
 import SHA: sha256, sha1
 using Pkg.TOML, Dates, UUIDs
-using RegistryTools, Registrator
+using RegistryTools
 import LibGit2
 import PkgLicenses
 
@@ -447,6 +447,10 @@ function _package_is_registered(registry_url::AbstractString,
     return package in registered_packages
 end
 
+is_yggdrasil() = get(ENV, "YGGDRASIL", "false") == "true"
+# Use an Azure Pipelines environment variable to get the current commit hash
+yggdrasil_head() = get(ENV, "BUILD_SOURCEVERSION", "")
+
 function register_jll(name, build_version, dependencies, julia_compat;
                       deploy_repo="JuliaBinaryWrappers/$(name)_jll.jl",
                       code_dir=joinpath(Pkg.devdir(), "$(name)_jll"),
@@ -487,18 +491,24 @@ function register_jll(name, build_version, dependencies, julia_compat;
             pr_title = "New package: $(name_jll) v$(build_version)"
         end
         # Open pull request against JuliaRegistries/General
+        body = """
+        Autogenerated JLL package registration
+
+        * Registering JLL package $(basename(deploy_repo))
+        * Repository: https://github.com/$(deploy_repo)
+        * Version: v$(build_version)
+        """
+        if is_yggdrasil()
+            body *= """
+                    * Revision on Yggdrasil: https://github.com/JuliaPackaging/Yggdrasil/commit/$(yggdrasil_head())
+                    """
+        end
         params = Dict(
             "base" => "master",
             "head" => "$(reg_branch.branch)",
             "maintainer_can_modify" => true,
             "title" => pr_title,
-            "body" => """
-            Autogenerated JLL package registration
-
-            * Registering JLL package $(basename(deploy_repo))
-            * Repository: https://github.com/$(deploy_repo)
-            * Version: v$(build_version)
-            """
+            "body" => body,
         )
         Wizard.create_or_update_pull_request("JuliaRegistries/General", params; auth=gh_auth)
     end
@@ -1195,23 +1205,20 @@ function build_jll_package(src_name::String,
         """)
     end
 
-    is_yggdrasil = get(ENV, "YGGDRASIL", "false") == "true"
-    # Use an Azure Pipelines environment variable to get the current commit hash
-    ygg_head = is_yggdrasil ? ENV["BUILD_SOURCEVERSION"] : ""
     print_source(io, s::ArchiveSource) = println(io, "* compressed archive: ", s.url, " (SHA256 checksum: `", s.hash,"`)")
     print_source(io, s::GitSource) =     println(io, "* git repository: ", s.url, " (revision: `", s.hash,"`)")
     print_source(io, s::FileSource) =    println(io, "* file: ", s.url, " (SHA256 checksum: `", s.hash,"`)")
     function print_source(io, s::DirectorySource)
         print(io, "* files in directory, relative to originating `build_tarballs.jl`: ")
-        if is_yggdrasil
-            println(io, "[`", s.path, "`](https://github.com/JuliaPackaging/Yggdrasil/tree/", ygg_head, "/", ENV["PROJECT"], "/", basename(s.path), ")")
+        if is_yggdrasil()
+            println(io, "[`", s.path, "`](https://github.com/JuliaPackaging/Yggdrasil/tree/", yggdrasil_head(), "/", ENV["PROJECT"], "/", basename(s.path), ")")
         else
             println(io, "`", s.path, "`")
         end
     end
     function print_jll(io, dep)
         depname = getname(dep)
-        if is_yggdrasil
+        if is_yggdrasil()
             # In this case we can easily add a direct link to the repo
             println(io, "* [`", depname, "`](https://github.com/JuliaBinaryWrappers/", depname, ".jl)")
         else
@@ -1226,8 +1233,8 @@ function build_jll_package(src_name::String,
               # `$(src_name)_jll.jl` (v$(build_version))
 
               This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl).""")
-        if is_yggdrasil
-            print(io, " The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/$(ygg_head)/$(ENV["PROJECT"])/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.  If you have any issue, please report it to the Yggdrasil [bug tracker](https://github.com/JuliaPackaging/Yggdrasil/issues).")
+        if is_yggdrasil()
+            print(io, " The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/$(yggdrasil_head())/$(ENV["PROJECT"])/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.  If you have any issue, please report it to the Yggdrasil [bug tracker](https://github.com/JuliaPackaging/Yggdrasil/issues).")
         end
         println(io)
         println(io)