Skip to content

Commit

Permalink
[AutoBuild] Always require JLLWrappers v1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
giordano committed Dec 24, 2024
1 parent f3e1fa6 commit 78b8040
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "BinaryBuilder"
uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae"
authors = ["Elliot Saba <[email protected]>"]
version = "0.6.1"
version = "0.6.2"

[deps]
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
Expand Down
4 changes: 2 additions & 2 deletions src/AutoBuild.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import LibGit2
import PkgLicenses

const DEFAULT_JULIA_VERSION_SPEC = "1.0"
const DEFAULT_JLLWRAPPERS_VERSION_SPEC = "1.2.0"
const DEFAULT_JLLWRAPPERS_VERSION_SPEC = "1.7.0"
const PKG_VERSIONS = Base.VERSION >= v"1.7-" ? Pkg.Versions : Pkg.Types

mutable struct BuildTimer
Expand Down Expand Up @@ -597,7 +597,7 @@ function register_jll(name, build_version, dependencies, julia_compat;
cache = RegistryTools.RegistryCache(joinpath(Pkg.depots1(), "registries_binarybuilder"))
registry_url = "https://$(gh_username):$(gh_auth.token)@github.com/JuliaRegistries/General"
cache.registries[registry_url] = Base.UUID("23338594-aafe-5451-b93e-139f81909106")
jllwrappers_compat = isempty(augment_platform_block) ? DEFAULT_JLLWRAPPERS_VERSION_SPEC : "1.4.0"
jllwrappers_compat = DEFAULT_JLLWRAPPERS_VERSION_SPEC
project = Pkg.Types.Project(build_project_dict(name, build_version, dependencies, julia_compat; jllwrappers_compat, lazy_artifacts, augment_platform_block))
project_file = joinpath(mktempdir(), "Project.toml")
Pkg.Types.write_project(project, project_file)
Expand Down
2 changes: 1 addition & 1 deletion test/jll.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module TestJLL end
@test project["compat"] == Dict(
"julia" => "1.0",
"XZ_jll" => "=2.4.6",
"JLLWrappers" => "1.2.0",
"JLLWrappers" => "1.7.0",
"Libdl" => "< 0.0.1, 1",
"Artifacts" => "< 0.0.1, 1",
"Pkg" => "< 0.0.1, 1",
Expand Down

0 comments on commit 78b8040

Please sign in to comment.