fix: Minor fixes for 1.14. (#1075)

* Fix yarn. * Fix log. * Bump version.
moonrepo · Sep 27, 2023 · b40e484 · b40e484
1 parent 2c5cc17
commit b40e484
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/.yarn/versions/ff386954.yml b/.yarn/versions/ff386954.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
diff --git a/crates/core/runner/src/runner.rs b/crates/core/runner/src/runner.rs
@@ -570,7 +570,7 @@ impl<'a> Runner<'a> {
         // For long-running process, log a message every 30 seconds to indicate it's still running
         let interval_target = self.task.target.clone();
         let interval_handle = task::spawn(async move {
-            if is_persistent {
+            if is_persistent || is_interactive {
                 return;
             }
 

diff --git a/crates/node/tool/src/pnpm_tool.rs b/crates/node/tool/src/pnpm_tool.rs
@@ -191,7 +191,7 @@ impl DependencyManager<NodeTool> for PnpmTool {
     ) -> miette::Result<()> {
         let mut args = vec!["install"];
 
-        if is_ci() {
+        if !self.global && is_ci() {
             let lockfile = working_dir.join(self.get_lock_filename());
 
             // Will fail with "Headless installation requires a pnpm-lock.yaml file"

diff --git a/crates/node/tool/src/yarn_tool.rs b/crates/node/tool/src/yarn_tool.rs
@@ -249,17 +249,19 @@ impl DependencyManager<NodeTool> for YarnTool {
     ) -> miette::Result<()> {
         let mut args = vec!["install"];
 
-        if !self.is_berry() {
-            args.push("--ignore-engines");
-        }
+        if !self.global {
+            if !self.is_berry() {
+                args.push("--ignore-engines");
+            }
 
-        if is_ci() {
-            if self.is_berry() {
-                args.push("--immutable");
-            } else {
-                args.push("--check-files");
-                args.push("--frozen-lockfile");
-                args.push("--non-interactive");
+            if is_ci() {
+                if self.is_berry() {
+                    args.push("--immutable");
+                } else {
+                    args.push("--check-files");
+                    args.push("--frozen-lockfile");
+                    args.push("--non-interactive");
+                }
             }
         }
 

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -10,6 +10,14 @@
   - More accurately monitors signals (ctrl+c) and shutdowns.
   - Tasks can now be configured with a timeout.
 
+## Unreleased
+
+#### 🐞 Fixes
+
+- Fixed an issue when using a global version of npm/pnpm/yarn, and the wrong arguments were being
+  passed to commands.
+- Fixed the "running for 0s" message constantly logging for interactive tasks.
+
 ## 1.14.0
 
 #### 🚀 Updates