fix: Audit 03/03 (#1852)

* Fix stream capture.

* Fix system.

* Polish.

* Bump.

* Fixes.

* Fixes.

Author: milesj

.yarn/versions/f44763e4.yml

@@ -0,0 +1,9 @@
+releases:
+  "@moonrepo/cli": patch
+  "@moonrepo/core-linux-arm64-gnu": patch
+  "@moonrepo/core-linux-arm64-musl": patch
+  "@moonrepo/core-linux-x64-gnu": patch
+  "@moonrepo/core-linux-x64-musl": patch
+  "@moonrepo/core-macos-arm64": patch
+  "@moonrepo/core-macos-x64": patch
+  "@moonrepo/core-windows-x64-msvc": patch

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+#### 🐞 Fixes
+
+- Fixed an issue where task output wasn't captured for the "review" section in a run summary.
+- Fixed an issue where a task with a `script` would always be forced to the "system" toolchain.
+
 ## 1.32.7
 
 #### 🚀 Updates

crates/console-reporter/src/default_reporter.rs

@@ -161,12 +161,6 @@ impl DefaultReporter {
                 continue;
             }
 
-            if let Some(attempt) = action.operations.get_last_execution() {
-                if attempt.has_failed() {
-                    self.print_operation_output(attempt, &TaskReportItem::default())?;
-                }
-            }
-
             self.out.print_checkpoint(
                 Checkpoint::RunFailed,
                 match &*action.node {
@@ -175,6 +169,16 @@ impl DefaultReporter {
                 },
             )?;
 
+            if let Some(attempt) = action.operations.get_last_execution() {
+                if attempt.has_failed() {
+                    self.print_operation_output(attempt, &TaskReportItem::default())?;
+                }
+            }
+
+            // Force flush so the output is rendered in the correct order
+            self.out.flush()?;
+            self.err.flush()?;
+
             self.out.write_newline()?;
         }
 

crates/task-builder/src/tasks_builder.rs

@@ -441,7 +441,10 @@ impl<'proj> TasksBuilder<'proj> {
         // If a script, wipe out inherited arguments, and extract the first command
         if let Some(script) = &task.script {
             task.args.clear();
-            task.toolchains = vec![Id::raw("system")];
+
+            if task.toolchains.is_empty() {
+                task.toolchains.push(Id::raw("system"));
+            }
 
             if let Some(i) = script.find(' ') {
                 task.command = script[0..i].to_owned();

crates/task-runner/src/command_executor.rs

@@ -113,8 +113,8 @@ impl<'task> CommandExecutor<'task> {
                 interactive: bool,
             ) -> miette::Result<Output> {
                 match (stream, interactive) {
-                    (true, true) | (false, true) => command.exec_stream_output().await,
-                    (true, false) => command.exec_stream_and_capture_output().await,
+                    (true, false) | (true, true) => command.exec_stream_and_capture_output().await,
+                    (false, true) => command.exec_stream_output().await,
                     _ => command.exec_capture_output().await,
                 }
             }

legacy/rust/platform/src/rust_platform.rs

@@ -401,9 +401,9 @@ impl Platform for RustPlatform {
             );
         }
 
-        if !self.config.bins.is_empty() {
-            let globals_dir = self.get_globals_dir(Some(tool));
+        let globals_dir = self.get_globals_dir(Some(tool));
 
+        if !self.config.bins.is_empty() {
             // Install cargo-binstall if it does not exist
             if !globals_dir.join(exe_name("cargo-binstall")).exists() {
                 debug!(
@@ -436,28 +436,33 @@ impl Platform for RustPlatform {
 
             for bin in &self.config.bins {
                 let mut args = vec!["binstall", "--no-confirm", "--log-level", "info"];
-
-                match bin {
-                    BinEntry::Name(name) => args.push(name),
+                let name = match bin {
+                    BinEntry::Name(inner) => {
+                        args.push(inner);
+                        inner
+                    }
                     BinEntry::Config(cfg) => {
                         if cfg.local && is_ci() {
                             continue;
                         }
 
                         if cfg.force {
                             args.push("--force");
+                            // force = cfg.force;
                         }
 
                         args.push(&cfg.bin);
+                        &cfg.bin
                     }
                 };
 
                 operations.push(
                     Operation::task_execution(format!("cargo {}", args.join(" ")))
                         .track_async(|| async {
-                            self.console
-                                .out
-                                .print_checkpoint(Checkpoint::Setup, "cargo binstall")?;
+                            self.console.out.print_checkpoint(
+                                Checkpoint::Setup,
+                                format!("cargo binstall {name}"),
+                            )?;
 
                             tool.exec_cargo(args, working_dir).await
                         })