From 59d27ddaf00c122469418f3f95563b897b5448de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Sat, 15 Feb 2025 20:43:22 +0000 Subject: [PATCH 1/3] [Dependencies] Do not pass the content to `Pkg.add` in recent Julia --- src/Prefix.jl | 11 ++++++++++- test/dependencies.jl | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Prefix.jl b/src/Prefix.jl index 2e67c792..710f7db6 100644 --- a/src/Prefix.jl +++ b/src/Prefix.jl @@ -602,7 +602,7 @@ function get_addable_spec(name::AbstractString, version::VersionNumber; end # Helper function to install packages also in Julia v1.8 -function Pkg_add(args...; kwargs...) +function _Pkg_add(args...; kwargs...) @static if VERSION < v"1.8.0" Pkg.add(args...; kwargs...) else @@ -615,6 +615,15 @@ function Pkg_add(args...; kwargs...) end end +function Pkg_add(ctx::Pkg.Types.Context, rest...; kwargs...) + @static if VERSION >= v"1.13-" + # No need to pass the context anymore. + _Pkg_add(rest...; kwargs...) + else + _Pkg_add(ctx, rest...; kwargs...) + end +end + """ setup_dependencies(prefix::Prefix, dependencies::Vector{PackageSpec}, platform::AbstractPlatform; verbose::Bool = false) diff --git a/test/dependencies.jl b/test/dependencies.jl index 9f79f393..d4853032 100644 --- a/test/dependencies.jl +++ b/test/dependencies.jl @@ -373,7 +373,7 @@ end with_temp_project() do dir prefix = Prefix(dir) dependencies = [ - PackageSpec(; name="CMake_jll", version = v"3.24.3") + PackageSpec(; name="CMake_jll", version = "3.24.3") ] platform = Platform("x86_64", "linux"; libc="musl", cxxstring_abi="cxx11") if v"1.9" <= VERSION < v"1.11" From 85cc65309510b415f389b3a1d410fda392e1a453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Sat, 15 Feb 2025 21:10:48 +0000 Subject: [PATCH 2/3] [CI] Add job with Julia nightly --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef1716a3..6bd46cb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,10 @@ jobs: squashfs: true julia-version: "1.11" + - runner: privileged + squashfs: true + julia-version: "nightly" + # - runner: privileged # squashfs: true # julia-version: "nightly" From 280f6d87c225a51df054fc83ec05929b4df556c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <765740+giordano@users.noreply.github.com> Date: Sat, 15 Feb 2025 21:11:20 +0000 Subject: [PATCH 3/3] Update src/Prefix.jl Co-authored-by: Ian Butterworth --- src/Prefix.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Prefix.jl b/src/Prefix.jl index 710f7db6..ba57abc1 100644 --- a/src/Prefix.jl +++ b/src/Prefix.jl @@ -618,7 +618,7 @@ end function Pkg_add(ctx::Pkg.Types.Context, rest...; kwargs...) @static if VERSION >= v"1.13-" # No need to pass the context anymore. - _Pkg_add(rest...; kwargs...) + _Pkg_add(rest...; julia_version = ctx.julia_version, kwargs...) else _Pkg_add(ctx, rest...; kwargs...) end