Fix versioninfo and base it on BBB function (#965)

Author: giordano

Manifest.toml

@@ -27,8 +27,8 @@ version = "0.2.0"
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[BinaryBuilderBase]]
-deps = ["CodecZlib", "Downloads", "JSON", "LibGit2", "Libdl", "Logging", "OutputCollectors", "Pkg", "Random", "SHA", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll"]
-git-tree-sha1 = "65044aca23fe38abecefeb4c5a76f9d850a27580"
+deps = ["CodecZlib", "Downloads", "InteractiveUtils", "JSON", "LibGit2", "Libdl", "Logging", "OutputCollectors", "Pkg", "Random", "SHA", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll"]
+git-tree-sha1 = "5df61db5de60080b894f1e1d00460d4490e4f422"
 repo-rev = "master"
 repo-url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"
 uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
@@ -41,9 +41,9 @@ uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
 version = "0.7.0"
 
 [[DataAPI]]
-git-tree-sha1 = "176e23402d80e7743fc26c19c681bfb11246af32"
+git-tree-sha1 = "ad84f52c0b8f05aa20839484dbaf01690b41ff84"
 uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
-version = "1.3.0"
+version = "1.4.0"
 
 [[DataStructures]]
 deps = ["InteractiveUtils", "OrderedCollections"]
@@ -70,9 +70,9 @@ uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
 [[FileIO]]
 deps = ["Pkg"]
-git-tree-sha1 = "992b4aeb62f99b69fcf0cb2085094494cc05dfb3"
+git-tree-sha1 = "cad2e71389ecb2f4480e0de74faab04af13d7929"
 uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-version = "1.4.3"
+version = "1.4.4"
 
 [[FileWatching]]
 uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -85,9 +85,9 @@ version = "0.1.6"
 
 [[GitHub]]
 deps = ["Base64", "Dates", "HTTP", "JSON", "MbedTLS", "Sockets"]
-git-tree-sha1 = "07e94aa019727a2d05b73b14f1e3b8f130c8dbc8"
+git-tree-sha1 = "587c993cedac5707f72ce082f4f33d525e80ac40"
 uuid = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"
-version = "5.1.7"
+version = "5.1.8"
 
 [[HTTP]]
 deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
@@ -123,9 +123,9 @@ uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 version = "0.1.14"
 
 [[JLLWrappers]]
-git-tree-sha1 = "7cec881362e5b4e367ff0279dd99a06526d51a55"
+git-tree-sha1 = "c70593677bbf2c3ccab4f7500d0f4dacfff7b75c"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.1.2"
+version = "1.1.3"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -185,15 +185,15 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
 
 [[MbedTLS]]
 deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
-git-tree-sha1 = "426a6978b03a97ceb7ead77775a1da066343ec6e"
+git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe"
 uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
-version = "1.0.2"
+version = "1.0.3"
 
 [[MbedTLS_jll]]
-deps = ["Libdl", "Pkg"]
-git-tree-sha1 = "c0b1286883cac4e2b617539de41111e0776d02e8"
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "47e19f64fc939b86dea2b9b5e38c29c787f0d581"
 uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
-version = "2.16.8+0"
+version = "2.24.0+1"
 
 [[Mmap]]
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"
@@ -203,9 +203,9 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 
 [[Mustache]]
 deps = ["Printf", "Tables"]
-git-tree-sha1 = "26925183ee8926966a8387b437c5a5f33b6201cb"
+git-tree-sha1 = "f5d718790ff475b5b8ab9c1599ed105f0f24f253"
 uuid = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70"
-version = "1.0.7"
+version = "1.0.8"
 
 [[Mux]]
 deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "Lazy", "Pkg", "Sockets", "WebSockets"]
@@ -220,9 +220,9 @@ uuid = "d8793406-e978-5875-9003-1fc021f44a92"
 version = "0.3.6"
 
 [[OrderedCollections]]
-git-tree-sha1 = "16c08bf5dba06609fe45e30860092d6fa41fde7b"
+git-tree-sha1 = "cf59cfed2e2c12e8a2ff0a4f1e9b2cd8650da6db"
 uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
-version = "1.3.1"
+version = "1.3.2"
 
 [[OutputCollectors]]
 git-tree-sha1 = "d86c19b7fa8ad6a4dc8ec2c726642cc6291b2941"
@@ -231,9 +231,9 @@ version = "0.1.0"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "6fa4202675c05ba0f8268a6ddf07606350eda3ce"
+git-tree-sha1 = "b417be52e8be24e916e34b3d70ec2da7bdf56a68"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "1.0.11"
+version = "1.0.12"
 
 [[Pidfile]]
 deps = ["FileWatching", "Test"]
@@ -242,7 +242,7 @@ uuid = "fa939f87-e72e-5be4-a000-7fc836dbe307"
 version = "1.2.0"
 
 [[Pkg]]
-deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "UUIDs"]
+deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PkgLicenses]]
@@ -319,9 +319,9 @@ version = "1.0.0"
 
 [[Tables]]
 deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
-git-tree-sha1 = "24a584cf65e2cfabdadc21694fb69d2e74c82b44"
+git-tree-sha1 = "5131a624173d532299d1c7eb05341c18112b21b8"
 uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-version = "1.1.0"
+version = "1.2.1"
 
 [[Tar]]
 deps = ["ArgTools", "SHA"]
@@ -375,9 +375,9 @@ version = "4.3.2+5"
 
 [[Zlib_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6"
+git-tree-sha1 = "32085929ad61a5ed99abea288ec7242be392bb8b"
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
-version = "1.2.11+18"
+version = "1.2.12+0"
 
 [[ghr_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -387,6 +387,6 @@ version = "0.13.0+1"
 
 [[p7zip_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "ee65cfa19bea645698a0224bfa216f2b1c8b559f"
+git-tree-sha1 = "4b909fd780b3711197e3faa806dd631bdc5af510"
 uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
-version = "16.2.0+3"
+version = "16.2.1+0"

Project.toml

@@ -10,7 +10,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 GitHub = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"

azure-pipelines.yml

@@ -22,7 +22,8 @@ jobs:
     fetchDepth: 99999
     clean: true
   - bash: |
-      $(JULIA) -e 'using InteractiveUtils; versioninfo()'
+      set -e
+      $(JULIA) -e 'using BinaryBuilder; BinaryBuilder.versioninfo()'
       $(JULIA) -e 'using Pkg; Pkg.status()'
     name: SystemInfo
 

src/BinaryBuilder.jl

@@ -3,7 +3,6 @@ using Libdl, LibGit2, Random, JSON
 using BinaryBuilderBase
 using ObjectFile
 using GitHub
-import InteractiveUtils
 using Pkg, Base.BinaryPlatforms, Pkg.Artifacts
 using ghr_jll
 
@@ -54,102 +53,9 @@ function __init__()
     end
 end
 
-function get_bb_version()
-    # Get BinaryBuilder.jl's version and git sha
-    version = Pkg.TOML.parsefile(joinpath(@__DIR__, "..", "Project.toml"))["version"]
-    try
-        # get the gitsha if we can
-        repo = LibGit2.GitRepo(dirname(@__DIR__))
-        gitsha = string(LibGit2.GitHash(LibGit2.GitCommit(repo, "HEAD")))
-        return VersionNumber("$(version)-git-$(gitsha[1:10])")
-    catch
-        try
-            # Settle for the treehash otherwise
-            env = Pkg.Types.Context().env
-            bb_uuid = Pkg.Types.UUID("12aac903-9f7c-5d81-afc2-d9565ea332ae")
-            treehash = bytes2hex(env.manifest[bb_uuid].tree_hash.bytes)
-            return VersionNumber("$(version)-tree-$(treehash[1:10])")
-        catch
-            # Something went so wrong, we can't get any of that.
-            return VersionNumber(version)
-        end
-    end
-end
-
-"""
-    versioninfo()
-
-Helper function to print out some debugging information
-"""
-function versioninfo()
-    @info("Julia versioninfo(): ")
-    InteractiveUtils.versioninfo()
-
-    @info("BinaryBuilder.jl version: $(get_bb_version())")
-
-    @static if Sys.isunix()
-        @info("Kernel version: $(readchomp(`uname -r`))")
-    end
-
-    # Dump if some important directories are encrypted:
-    @static if Sys.islinux()
-        print_enc(n, path) = begin
-            is_encrypted, mountpoint = is_ecryptfs(path)
-            if is_encrypted
-                @info("$n is encrypted on mountpoint $mountpoint")
-            else
-                @info("$n is NOT encrypted on mountpoint $mountpoint")
-            end
-        end
-
-        print_enc("pkg dir", dirname(@__FILE__))
-        print_enc("storage dir", storage_dir())
-    end
-
-    # Dump any relevant environment variables:
-    @info("Relevant environment variables:")
-    env_var_suffixes = [
-        "AUTOMATIC_APPLE",
-        "USE_SQUASHFS",
-        "STORAGE_DIR",
-        "RUNNER",
-        "ALLOW_ECRYPTFS",
-        "USE_CCACHE",
-    ]
-    for e in env_var_suffixes
-        envvar = "BINARYBUILDER_$(e)"
-        if haskey(ENV, envvar)
-            @info("  $(envvar): \"$(ENV[envvar])\"")
-        end
-    end
-
-    # Print out the preferred runner stuff here:
-    @info("Preferred runner: $(preferred_runner())")
-
-    # Try to run 'echo julia' in Linux x86_64 environment
-    @info("Trying to run `echo hello julia` within a Linux x86_64 environment...")
-
-    runner = preferred_runner()(
-        pwd();
-        cwd="/workspace/",
-        platform=Platform("x86_64", "linux"),
-        verbose=true
-    )
-    run_interactive(runner, `/bin/bash -c "echo hello julia"`)
-
-    # If we use ccache, dump the ccache stats
-    if BinaryBuilderBase.use_ccache
-        @info("ccache stats:")
-        runner = preferred_runner()(
-            pwd();
-            cwd="/workspace/",
-            platform=Platform("x86_64", "linux"),
-        )
-        run_interactive(runner, `/usr/bin/ccache -s`)
-    end
-    return nothing
-end
-
+get_bb_version() =
+    BinaryBuilderBase.get_bbb_version(@__DIR__, "12aac903-9f7c-5d81-afc2-d9565ea332ae")
+versioninfo() = BinaryBuilderBase.versioninfo(; name=@__MODULE__, version=get_bb_version())
 
 # Precompilation ahoy!
 # include("../deps/SnoopCompile/precompile/precompile_BinaryBuilder.jl")