set julia_version in manifest during resolve only

(cherry picked from commit 52a2eeb)
JuliaLang · Jun 16, 2021 · 2018f15 · 2018f15
1 parent 377045e
commit 2018f15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Operations.jl b/src/Operations.jl
@@ -361,10 +361,13 @@ end
 function resolve_versions!(ctx::Context, pkgs::Vector{PackageSpec})
     # compatibility
     if ctx.julia_version !== nothing
+        ctx.env.manifest.julia_version = ctx.julia_version
         v = intersect(ctx.julia_version, project_compatibility(ctx, "julia"))
         if isempty(v)
             @warn "julia version requirement for project not satisfied" _module=nothing _file=nothing
         end
+    else
+        ctx.env.manifest.julia_version = VERSION
     end
     names = Dict{UUID, String}(uuid => stdlib for (uuid, stdlib) in stdlibs())
     # recursive search for packages which are tracking a path

diff --git a/src/Types.jl b/src/Types.jl
@@ -221,7 +221,7 @@ Base.:(==)(t1::PackageEntry, t2::PackageEntry) = t1.name == t2.name &&
 Base.hash(x::PackageEntry, h::UInt) = foldr(hash, [x.name, x.version, x.path, x.pinned, x.repo, x.tree_hash, x.deps], init=h)  # omits `other`
 
 Base.@kwdef mutable struct Manifest
-    julia_version::Union{Nothing,VersionNumber} = Base.VERSION
+    julia_version::Union{Nothing,VersionNumber} = nothing # only set to VERSION when resolving
     manifest_format::VersionNumber = v"1.0.0" # default to older flat format
     deps::Dict{UUID,PackageEntry} = Dict{UUID,PackageEntry}()
     other::Dict{String,Any} = Dict{String,Any}()