Skip to content

Commit c66d7ec

Browse files
KristofferCKristofferCIanButterworth
committed
propagate include_lazy through download_artifacts (#3106)
Co-authored-by: KristofferC <[email protected]> Co-authored-by: Ian Butterworth <[email protected]> (cherry picked from commit eab1b8b)
1 parent 2955563 commit c66d7ec

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/Operations.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ function install_git(
818818
end
819819
end
820820

821-
function collect_artifacts(pkg_root::String; platform::AbstractPlatform=HostPlatform())
821+
function collect_artifacts(pkg_root::String; platform::AbstractPlatform=HostPlatform(), include_lazy::Bool=false)
822822
# Check to see if this package has an (Julia)Artifacts.toml
823823
artifacts_tomls = Tuple{String,Base.TOML.TOMLDict}[]
824824
for f in artifact_names
@@ -842,7 +842,7 @@ function collect_artifacts(pkg_root::String; platform::AbstractPlatform=HostPlat
842842
end
843843
else
844844
# Otherwise, use the standard selector from `Artifacts`
845-
artifacts = select_downloadable_artifacts(artifacts_toml; platform)
845+
artifacts = select_downloadable_artifacts(artifacts_toml; platform, include_lazy)
846846
push!(artifacts_tomls, (artifacts_toml, artifacts))
847847
end
848848
break
@@ -862,7 +862,9 @@ end
862862
function download_artifacts(ctx::Context;
863863
platform::AbstractPlatform=HostPlatform(),
864864
julia_version = VERSION,
865-
verbose::Bool=false)
865+
verbose::Bool=false,
866+
io::IO=stderr_f(),
867+
include_lazy::Bool=false)
866868
env = ctx.env
867869
io = ctx.io
868870
fancyprint = can_fancyprint(io)
@@ -888,7 +890,7 @@ function download_artifacts(ctx::Context;
888890
ansi_enablecursor = "\e[?25h"
889891
ansi_disablecursor = "\e[?25l"
890892

891-
all_collected_artifacts = reduce(vcat, map(pkg_root -> collect_artifacts(pkg_root; platform), pkg_roots))
893+
all_collected_artifacts = reduce(vcat, map(pkg_root -> collect_artifacts(pkg_root; platform, include_lazy), pkg_roots))
892894
used_artifact_tomls = Set{String}(map(first, all_collected_artifacts))
893895
longest_name_length = maximum(all_collected_artifacts; init=0) do (artifacts_toml, artifacts)
894896
maximum(textwidth, keys(artifacts); init=0)

0 commit comments

Comments
 (0)