Skip to content

Commit

Permalink
Use root module when determining UUID in @artifact_str (#45392)
Browse files Browse the repository at this point in the history 
Otherwise, overrides do not trigger when using `artifact"..."` inside a
submodule.
  • Loading branch information
@zickgraf
zickgraf authored May 21, 2022
1 parent 88def1a commit 9b106ad
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions stdlib/Artifacts/src/Artifacts.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,10 @@ function jointail(dir, tail)
end

function _artifact_str(__module__, artifacts_toml, name, path_tail, artifact_dict, hash, platform, @nospecialize(lazyartifacts))
if haskey(Base.module_keys, __module__)
moduleroot = Base.moduleroot(__module__)
if haskey(Base.module_keys, moduleroot)
# Process overrides for this UUID, if we know what it is
process_overrides(artifact_dict, Base.module_keys[__module__].uuid)
process_overrides(artifact_dict, Base.module_keys[moduleroot].uuid)
end

# If the artifact exists, we're in the happy path and we can immediately
Expand Down

2 comments on commit 9b106ad

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily package evaluation, I will reply here when finished:

@nanosoldier runtests(ALL, isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your package evaluation job has completed - possible new issues were detected. A full report can be found here.

Please sign in to comment.