Skip to content

Commit 35e4fd9

Browse files
committed
Plumb some verbosity settings to silence excess Pkg output
1 parent ddbcb51 commit 35e4fd9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/AutoBuild.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ function get_next_wrapper_version(src_name, src_version)
382382
ctx = Pkg.Types.Context()
383383

384384
# Force-update the registry here, since we may have pushed a new version recently
385-
update_registry(ctx)
385+
update_registry(ctx, devnull)
386386

387387
# If it does, we need to bump the build number up to the next value
388388
build_number = 0
@@ -597,7 +597,7 @@ function autobuild(dir::AbstractString,
597597
build_output_meta = Dict()
598598

599599
# Resolve dependencies into PackageSpecs now, ensuring we have UUIDs for all deps
600-
all_resolved, dependencies = resolve_jlls(dependencies)
600+
all_resolved, dependencies = resolve_jlls(dependencies, outs=(verbose ? stdout : devnull))
601601
if !all_resolved
602602
error("Invalid dependency specifications!")
603603
end
@@ -627,7 +627,7 @@ function autobuild(dir::AbstractString,
627627
source_files;
628628
verbose=verbose,
629629
)
630-
artifact_paths = setup_dependencies(prefix, getpkg.(dependencies), concrete_platform)
630+
artifact_paths = setup_dependencies(prefix, getpkg.(dependencies), concrete_platform; verbose=verbose)
631631

632632
# Create a runner to work inside this workspace with the nonce built-in
633633
ur = preferred_runner()(

src/wizard/interactive_build.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ function step34(state::WizardState)
518518
preferred_gcc_version = state.preferred_gcc_version,
519519
preferred_llvm_version = state.preferred_llvm_version,
520520
compilers = state.compilers)
521-
artifact_paths = setup_dependencies(prefix, getpkg.(state.dependencies), concrete_platform)
521+
artifact_paths = setup_dependencies(prefix, getpkg.(state.dependencies), concrete_platform; verbose=true)
522522

523523
provide_hints(state, joinpath(prefix, "srcdir"))
524524

@@ -566,7 +566,7 @@ function step5_internal(state::WizardState, platform::Platform)
566566
preferred_gcc_version = state.preferred_gcc_version,
567567
preferred_llvm_version = state.preferred_llvm_version,
568568
compilers = state.compilers)
569-
artifact_paths = setup_dependencies(prefix, getpkg.(state.dependencies), concrete_platform)
569+
artifact_paths = setup_dependencies(prefix, getpkg.(state.dependencies), concrete_platform; verbose=true)
570570
# Record newly added artifacts for this prefix
571571
prefix_artifacts[prefix] = artifact_paths
572572
ur = preferred_runner()(
@@ -644,7 +644,7 @@ function step5_internal(state::WizardState, platform::Platform)
644644
preferred_gcc_version = state.preferred_gcc_version,
645645
preferred_llvm_version = state.preferred_llvm_version,
646646
compilers = state.compilers)
647-
artifact_paths = setup_dependencies(prefix, getpkg.(state.dependencies), platform)
647+
artifact_paths = setup_dependencies(prefix, getpkg.(state.dependencies), platform; verbose=true)
648648
# Record newly added artifacts for this prefix
649649
prefix_artifacts[prefix] = artifact_paths
650650

@@ -779,7 +779,7 @@ function step5c(state::WizardState)
779779
preferred_gcc_version = state.preferred_gcc_version,
780780
preferred_llvm_version = state.preferred_llvm_version,
781781
compilers = state.compilers)
782-
artifact_paths = setup_dependencies(prefix, getpkg.(state.dependencies), concrete_platform)
782+
artifact_paths = setup_dependencies(prefix, getpkg.(state.dependencies), concrete_platform; verbose=false)
783783
ur = preferred_runner()(
784784
prefix.path;
785785
cwd="/workspace/srcdir",

0 commit comments

Comments
 (0)