diff --git a/Project.toml b/Project.toml index 336b1d6..2b08678 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "JLLWrappers" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" authors = ["Mosè Giordano", "Elliot Saba"] -version = "1.6.1" +version = "1.7.0" [deps] Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" diff --git a/src/toplevel_generators.jl b/src/toplevel_generators.jl index 7295d37..7fd63e6 100644 --- a/src/toplevel_generators.jl +++ b/src/toplevel_generators.jl @@ -110,7 +110,9 @@ function generate_wrapper_load(src_name, pkg_uuid, __source__) @static if VERSION < v"1.6.0-DEV" return :(parse_wrapper_platform(x) = platform_key_abi(x)) else - return :(parse_wrapper_platform(x) = parse(Platform, x)) + # Use `tryparse` because the `Artifacts.toml` file cound include artifacts for + # platforms/architectures not yet supported by the current version of Julia. + return :(parse_wrapper_platform(x) = tryparse(Platform, x)) end end @@ -142,7 +144,12 @@ function generate_wrapper_load(src_name, pkg_uuid, __source__) # package-specific Generator-closures d = Dict{Platform,String}() for f in x - d[parse_wrapper_platform(basename(f)[1:end-3])] = joinpath(dir, "wrappers", f) + platform = parse_wrapper_platform(basename(f)[1:end-3]) + # `platform` could be `nothing` for example if the architecture isn't + # known to currently running Julia version. + if !isnothing(platform) + d[platform] = joinpath(dir, "wrappers", f) + end end return d end diff --git a/test/runtests.jl b/test/runtests.jl index 9116ab2..e45de57 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -18,7 +18,7 @@ if VERSION <= v"1.6.0-DEV" ] else test_pkgs = [ - ("HelloWorldC", v"1.3.0+0"), + ("HelloWorldC", v"1.4.0+0"), ("LAMMPS", v"2.4.0+0"), ("libxls", v"1.6.2+0"), ("Vulkan_Headers", v"1.3.243+1"),