Skip to content

Commit ade91ad

Browse files
committed
bump starbase_console for new with_reporter api
1 parent e2af408 commit ade91ad

5 files changed

Lines changed: 14 additions & 8 deletions

File tree

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ starbase_archive = { version = "0.13.2", default-features = false, features = [
7070
"zip-all",
7171
] }
7272
starbase_args = { version = "0.1.11" }
73-
starbase_console = { version = "0.6.29", features = ["miette"] }
73+
starbase_console = { version = "0.6.31", features = ["miette"] }
7474
starbase_id = { version = "0.3.3", features = ["miette", "schematic"] }
7575
starbase_sandbox = "0.11.1"
76-
starbase_shell = "0.12.5"
76+
starbase_shell = "0.12.6"
7777
starbase_styles = { version = "0.6.1", features = ["relative-path"] }
7878
starbase_utils = { version = "0.13.8", default-features = false, features = [
7979
"editor-config",

crates/actions/src/actions/setup_toolchain.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use moon_env_var::GlobalEnvBag;
99
use moon_hash::fingerprint;
1010
use moon_pdk_api::SetupToolchainInput;
1111
use moon_toolchain::is_using_global_toolchain;
12+
use proto_core::reporter::{ProtoReporter, ReporterFormat};
1213
use std::sync::Arc;
1314
use tracing::{debug, instrument};
1415

@@ -90,6 +91,9 @@ pub async fn setup_toolchain(
9091
);
9192

9293
let setup_op = Operation::setup_operation(action.get_prefix())?;
94+
let proto_console = app_context
95+
.console
96+
.with_reporter(ProtoReporter::new(ReporterFormat::Text));
9397
let output = toolchain
9498
.setup_toolchain(
9599
SetupToolchainInput {
@@ -98,6 +102,7 @@ pub async fn setup_toolchain(
98102
toolchain_config: app_context.toolchain_registry.create_config(&toolchain.id),
99103
version: None,
100104
},
105+
Some(proto_console),
101106
|| {
102107
app_context.console.print_checkpoint(
103108
Checkpoint::Setup,

crates/toolchain-plugin/src/toolchain_plugin.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@ impl ToolchainPlugin {
515515
pub async fn setup_toolchain(
516516
&self,
517517
mut input: SetupToolchainInput,
518+
console: Option<ProtoConsole>,
518519
on_setup: impl FnOnce() -> miette::Result<()>,
519520
) -> miette::Result<SetupToolchainOutput> {
520521
let mut output = SetupToolchainOutput::default();
@@ -552,7 +553,7 @@ impl ToolchainPlugin {
552553
skip_prompts: true,
553554
skip_ui: true,
554555
strategy,
555-
console: building.then(|| ProtoConsole::new(false)),
556+
console: building.then_some(console).flatten(),
556557
log_writer: building.then(LogWriter::default),
557558
..Default::default()
558559
},

crates/toolchain-plugin/src/toolchain_registry_actions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ impl ToolchainRegistry {
377377
"setup_toolchain",
378378
self.get_plugin_ids(),
379379
input_factory,
380-
|toolchain, input| async move { toolchain.setup_toolchain(input, || Ok(())).await },
380+
|toolchain, input| async move { toolchain.setup_toolchain(input, None, || Ok(())).await },
381381
true,
382382
)
383383
.await

0 commit comments

Comments
 (0)