add support for dynamic artifact selection (#690)

Author: KristofferC

examples/MyApp/Project.toml

@@ -9,4 +9,5 @@ Crayons = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 Example = "7876af07-990d-54b4-ab0e-23690620f79a"
 HelloWorldC_jll = "dca1746e-5efc-54fc-8249-22745bc95a49"
+LLVMExtra_jll = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

examples/MyApp/src/MyApp.jl

@@ -5,6 +5,7 @@ using HelloWorldC_jll
 using Artifacts
 using Distributed
 using Random
+using LLVMExtra_jll
 
 const myrand = rand()
 
@@ -72,13 +73,19 @@ function real_main()
         addprocs(4)
         @eval @everywhere using MyApp
     end
-   
+
     n = @distributed (+) for i = 1:20000000
         1
     end
     println("n = $n")
     @eval @everywhere using Example
     @everywhere println(Example.domath(3))
+
+    if isfile(LLVMExtra_jll.libLLVMExtra_path)
+        println("LLVMExtra path: ok!")
+    else
+        println("LLVMExtra path: fail!")
+    end
     return
 end
 

src/PackageCompiler.jl

@@ -1072,16 +1072,25 @@ function bundle_artifacts(ctx, dest_dir; include_lazy_artifacts::Bool)
         pkg_source_path = source_path(ctx, pkg)
         pkg_source_path === nothing && continue
         bundled_artifacts_pkg = Pair{String, String}[]
-        # Check to see if this package has an (Julia)Artifacts.toml
-        for f in Pkg.Artifacts.artifact_names
-            artifacts_toml_path = joinpath(pkg_source_path, f)
-            if isfile(artifacts_toml_path)
-                artifacts = Artifacts.select_downloadable_artifacts(artifacts_toml_path; platform, include_lazy=include_lazy_artifacts)
-                for name in keys(artifacts)
-                    artifact_path = Pkg.ensure_artifact_installed(name, artifacts[name], artifacts_toml_path; platform)
-                    push!(bundled_artifacts_pkg, name => artifact_path)
+        if isdefined(Pkg.Operations, :collect_artifacts)
+            for (artifacts_toml, artifacts) in Pkg.Operations.collect_artifacts(pkg_source_path; platform)
+                for (name, data) in artifacts
+                    Pkg.ensure_artifact_installed(name, artifacts[name], artifacts_toml; platform)
+                    hash = Base.SHA1(data["git-tree-sha1"])
+                    push!(bundled_artifacts_pkg, name => artifact_path(hash))
+                end
+            end
+        else
+            for f in Pkg.Artifacts.artifact_names
+                artifacts_toml_path = joinpath(pkg_source_path, f)
+                if isfile(artifacts_toml_path)
+                    artifacts = Artifacts.select_downloadable_artifacts(artifacts_toml_path; platform, include_lazy=include_lazy_artifacts)
+                    for name in keys(artifacts)
+                        artifact_path = Pkg.ensure_artifact_installed(name, artifacts[name], artifacts_toml_path; platform)
+                        push!(bundled_artifacts_pkg, name => artifact_path)
+                    end
+                    break
                 end
-                break
             end
         end
         if !isempty(bundled_artifacts_pkg)

test/runtests.jl

@@ -62,8 +62,8 @@ end
             tmp_app_source_dir = joinpath(tmp, "MyApp")
             cp(app_source_dir, tmp_app_source_dir)
             create_app(tmp_app_source_dir, app_compiled_dir; incremental=incremental, force=true, filter_stdlibs=filter,
-                       precompile_execution_file=joinpath(app_source_dir, "precompile_app.jl"), 
-                       executables=["MyApp" => "julia_main", 
+                       precompile_execution_file=joinpath(app_source_dir, "precompile_app.jl"),
+                       executables=["MyApp" => "julia_main",
                                     "SecondApp" => "second_main",
                                     "ReturnType" => "wrong_return_type",
                                     "Error" => "erroring",
@@ -111,6 +111,8 @@ end
             @test occursin("From worker 4:\t8", app_output)
             @test occursin("From worker 5:\t8", app_output)
 
+            @test occursin("LLVMExtra path: ok!", app_output)
+
             # Test second app
             app_output = read(`$(app_path("SecondApp"))`, String)
             @test occursin("Hello from second main", app_output)