Allow TOML as dependency of JLL packages

giordano commented 2 years ago

Since https://github.com/JuliaPackaging/BinaryBuilder.jl/pull/1128 we also use TOML for JLLs in some cases.

DilumAluthge commented 2 years ago

bors merge

bors[bot] commented 2 years ago

Build failed:

Unit/Julia nightly/ubuntu-latest/x64

fredrikekre commented 2 years ago

Needs

diff --git a/src/AutoMerge/util.jl b/src/AutoMerge/util.jl
index 5eed6e9..99d1547 100644
--- a/src/AutoMerge/util.jl
+++ b/src/AutoMerge/util.jl
@@ -287,7 +287,7 @@ function get_all_non_jll_package_names(registry_dir::AbstractString)
         x in values(TOML.parsefile(joinpath(registry_dir, "Registry.toml"))["packages"])
     ]
     sort!(packages)
-    append!(packages, values(RegistryTools.stdlibs()))
+    append!(packages, (RegistryTools.get_stdlib_name(x) for x in values(RegistryTools.stdlibs())))
     filter!(x -> !endswith(x, "_jll"), packages)
     unique!(packages)
     return packages

to use https://github.com/JuliaRegistries/RegistryTools.jl/pull/66 I think.

maleadt commented 2 years ago

Bump.

DilumAluthge commented 2 years ago

bors merge

bors[bot] commented 2 years ago

Build succeeded:

JuliaRegistries / RegistryCI.jl

Allow TOML as dependency of JLL packages #443