Adding back is_ci

vercel · Aug 8, 2023 · 894f332 · 894f332
1 parent ef5aca7
commit 894f332
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/turborepo-lib/src/run/mod.rs b/crates/turborepo-lib/src/run/mod.rs
@@ -9,6 +9,7 @@ use tracing::{debug, info};
 use turborepo_cache::{http::APIAuth, AsyncCache};
 use turborepo_env::EnvironmentVariableMap;
 use turborepo_scm::SCM;
+use turborepo_ui::UI;
 
 use crate::{
     commands::CommandBase, config::TurboJson, daemon::DaemonConnector, manager::Manager,
@@ -61,7 +62,7 @@ impl Run {
         }
 
         // There's some warning handling code in Go that I'm ignoring
-        if self.base.ui.is_ci() && !opts.run_opts.no_daemon {
+        if UI::is_ci() && !opts.run_opts.no_daemon {
             info!("skipping turbod since we appear to be in a non-interactive context");
         } else if !opts.run_opts.no_daemon {
             let connector = DaemonConnector {

diff --git a/crates/turborepo-ui/Cargo.toml b/crates/turborepo-ui/Cargo.toml
@@ -17,3 +17,4 @@ lazy_static = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 turbopath = { workspace = true }
+turborepo-ci = { workspace = true }
diff --git a/crates/turborepo-ui/src/lib.rs b/crates/turborepo-ui/src/lib.rs
@@ -1,6 +1,6 @@
 mod log_replayer;
 
-use std::{borrow::Cow, env, f64::consts::PI, time::Duration};
+use std::{borrow::Cow, env, f64::consts::PI, io::IsTerminal, time::Duration};
 
 use console::{Style, StyledObject};
 use indicatif::{ProgressBar, ProgressStyle};
@@ -50,6 +50,10 @@ impl UI {
         Self { should_strip_ansi }
     }
 
+    pub fn is_ci() -> bool {
+        turborepo_ci::is_ci() && std::io::stdout().is_terminal()
+    }
+
     /// Infer the color choice from environment variables and checking if stdout
     /// is a tty
     pub fn infer() -> Self {