Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AutoBuild] Do not add Pkg as dependency if we require Julia v1.6 #1261

Merged
merged 1 commit into from Feb 11, 2023
Merged

[AutoBuild] Do not add Pkg as dependency if we require Julia v1.6 #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/AutoBuild.jl
View file
Open in desktop
Expand Up @@ -1646,12 +1646,14 @@ function build_project_dict(name, version, dependencies::Array{Dependency},
project["compat"][depname] = dep.compat
end
end
# Always add Libdl, Pkg and Artifacts as dependencies
# Once we stop supporting Julia 1.5-, we can drop the `Pkg` requirement.
# Always add Libdl, Artifacts, and JLLWrappers as dependencies.
project["deps"]["Libdl"] = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
project["deps"]["Pkg"] = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
project["deps"]["Artifacts"] = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
project["deps"]["JLLWrappers"] = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
if minimum_compat(julia_compat) < v"1.6"
# `Pkg` is used in JLLWrappers only when we require Julia v1.5-.
project["deps"]["Pkg"] = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
end
if lazy_artifacts
project["deps"]["LazyArtifacts"] = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
end
Expand Down
2 changes: 2 additions & 0 deletions test/jll.jl
View file
Open in desktop
Expand Up @@ -29,6 +29,8 @@ module TestJLL end
@test project["version"] == "1.3.5"
# Make sure BuildDependency's don't find their way to the project
@test_throws MethodError build_project_dict("LibFoo", v"1.3.5", [Dependency("Zlib_jll"), BuildDependency("Xorg_util_macros_jll")])
# `Pkg` should not be a dependency if we require Julia v1.6.
@test !haskey(BinaryBuilder.build_project_dict("foo", v"1.2", Dependency[], "1.6")["deps"], "Pkg")

gh_auth = Wizard.github_auth(;allow_anonymous=true)
@test get_github_author_login("JuliaPackaging/Yggdrasil", "invalid_hash"; gh_auth) === nothing
Expand Down