From fe6cd5fa856795c127e2ff1b254202334d89de2b Mon Sep 17 00:00:00 2001 From: Josh Day Date: Tue, 25 Jun 2024 10:03:25 -0400 Subject: [PATCH] fix tests --- src/DepotDelivery.jl | 17 +++++++++++------ test/TestProject/Manifest.toml | 8 ++++---- test/runtests.jl | 1 + 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/DepotDelivery.jl b/src/DepotDelivery.jl index 802d289..3eaf024 100644 --- a/src/DepotDelivery.jl +++ b/src/DepotDelivery.jl @@ -52,12 +52,17 @@ function build(path::String; platform = Base.BinaryPlatforms.HostPlatform(), ver Pkg.activate(joinpath(depot, "dev", name)) Pkg.instantiate(; platform, verbose) - # Ensure all artifacts (including lazy ones) are installed for the correct platform - manifest_file = replace(proj_file, "Project" => "Manifest") - for (uuid, entry) in Pkg.Types.read_manifest(manifest_file) - src = Pkg.dir(entry.name) # How to get the source directory of a package? - # find entry's Artifacts.toml - end + # # Ensure all artifacts (including lazy ones) are installed for the correct platform + # manifest_file = replace(proj_file, "Project" => "Manifest") + # for (uuid, entry) in Pkg.Types.read_manifest(manifest_file) + # artifacts_path = @eval let + # name = $(Symbol(entry.name)) + # @eval import name + # Pkg.Artifacts.find_artifacts_toml(pathof(name)) + # end + # isnothing(artifacts_path) && continue + # Pkg.Artifacts.select_downloadable_artifacts(entry.name; platform, include_lazy=true) + # end open(io -> TOML.print(io, build_spec), joinpath(depot, "config", "depot_build.toml"), "w") diff --git a/test/TestProject/Manifest.toml b/test/TestProject/Manifest.toml index b12c43e..ce2c48f 100644 --- a/test/TestProject/Manifest.toml +++ b/test/TestProject/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.2" +julia_version = "1.10.4" manifest_format = "2.0" project_hash = "b6c8be5a742fdffa37a9701ccc32d1928629b873" @@ -30,7 +30,7 @@ version = "4.13.0" [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "1.1.0+0" +version = "1.1.1+0" [[deps.Dates]] deps = ["Printf"] @@ -58,9 +58,9 @@ version = "0.17.1" [[deps.HDF5_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] -path = "/Users/joshday/.julia/dev/HDF5_jll" +git-tree-sha1 = "82a471768b513dc39e471540fdadc84ff80ff997" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.14.3+1" +version = "1.14.3+3" [[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] diff --git a/test/runtests.jl b/test/runtests.jl index a6e1f16..9202137 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -8,6 +8,7 @@ depot = DepotDelivery.build(joinpath(@__DIR__, "TestProject")) DepotDelivery.sandbox() do include(joinpath(depot, "config", "depot_startup.jl")) + @test !any(x -> occursin(".julia", x), DEPOT_PATH) # Ensure DEPOT_PATH changed @test !occursin(".julia", pathof(TestProject)) @test !occursin(".julia", pathof(TestProject.HDF5)) @test !occursin(".julia", pathof(TestProject.HDF5.API.HDF5_jll))