Skip to content

Commit e15eb9c

Browse files
committed
only upgrade JLLWrappers version if needed
1 parent 8933003 commit e15eb9c

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/AutoBuild.jl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ function register_jll(name, build_version, dependencies, julia_compat;
520520
gh_auth=Wizard.github_auth(;allow_anonymous=false),
521521
gh_username=gh_get_json(DEFAULT_API, "/user"; auth=gh_auth)["login"],
522522
lazy_artifacts::Bool=false,
523+
augment_platform_block="",
523524
kwargs...)
524525
# Calculate tree hash of wrapper code
525526
wrapper_tree_hash = bytes2hex(Pkg.GitTools.tree_hash(code_dir))
@@ -530,7 +531,8 @@ function register_jll(name, build_version, dependencies, julia_compat;
530531
cache = RegistryTools.RegistryCache(joinpath(Pkg.depots1(), "registries_binarybuilder"))
531532
registry_url = "https://$(gh_username):$(gh_auth.token)@github.com/JuliaRegistries/General"
532533
cache.registries[registry_url] = Base.UUID("23338594-aafe-5451-b93e-139f81909106")
533-
project = Pkg.Types.Project(build_project_dict(name, build_version, dependencies, julia_compat; lazy_artifacts=lazy_artifacts))
534+
JLLWrappers = isempty(augment_platform_block) ? "1.2.0" : "1.4.0"
535+
project = Pkg.Types.Project(build_project_dict(name, build_version, dependencies, julia_compat; JLLWrappers, lazy_artifacts=lazy_artifacts))
534536
errors = setdiff(RegistryTools.registrator_errors, [:version_less_than_all_existing])
535537
reg_branch = RegistryTools.register(
536538
"https://github.com/$(deploy_repo).git",
@@ -1434,7 +1436,8 @@ function build_jll_package(src_name::String,
14341436

14351437
# Add a Project.toml. Note: here we list _all_ runtime dependencies, including those
14361438
# that may be required only for some platforms.
1437-
project = build_project_dict(src_name, build_version, dependencies, julia_compat; lazy_artifacts=lazy_artifacts)
1439+
JLLWrappers = isempty(augment_platform_block) ? "1.2.0" : "1.4.0"
1440+
project = build_project_dict(src_name, build_version, dependencies, julia_compat; lazy_artifacts=lazy_artifacts, JLLWrappers)
14381441
open(joinpath(code_dir, "Project.toml"), "w") do io
14391442
Pkg.TOML.print(io, project)
14401443
end
@@ -1507,7 +1510,7 @@ function find_uuid(ctx, pkg)
15071510
""")
15081511
end
15091512

1510-
function build_project_dict(name, version, dependencies::Array{Dependency}, julia_compat::String=DEFAULT_JULIA_VERSION_SPEC; lazy_artifacts::Bool=false, kwargs...)
1513+
function build_project_dict(name, version, dependencies::Array{Dependency}, julia_compat::String=DEFAULT_JULIA_VERSION_SPEC; lazy_artifacts::Bool=false, JLLWrappers="1.2.0", kwargs...)
15111514
Pkg.Types.semver_spec(julia_compat) # verify julia_compat is valid
15121515
project = Dict(
15131516
"name" => "$(name)_jll",
@@ -1516,7 +1519,7 @@ function build_project_dict(name, version, dependencies::Array{Dependency}, juli
15161519
"deps" => Dict{String,Any}(),
15171520
# We require at least Julia 1.3+, for Pkg.Artifacts support, but we only claim
15181521
# Julia 1.0+ by default so that empty JLLs can be installed on older versions.
1519-
"compat" => Dict{String,Any}("JLLWrappers" => "1.4.0",
1522+
"compat" => Dict{String,Any}("JLLWrappers" => JLLWrappers,
15201523
"julia" => "$(julia_compat)")
15211524
)
15221525

0 commit comments

Comments
 (0)