diff --git a/crates/turborepo-lib/src/config/mod.rs b/crates/turborepo-lib/src/config/mod.rs index fad0c7ed21dd8..1e405ffd5a8a2 100644 --- a/crates/turborepo-lib/src/config/mod.rs +++ b/crates/turborepo-lib/src/config/mod.rs @@ -320,6 +320,7 @@ pub struct ConfigurationOptions { pub(crate) allow_no_turbo_json: Option, pub(crate) tui_scrollback_length: Option, pub(crate) concurrency: Option, + #[serde(rename = "noUpdateNotifier")] pub(crate) no_update_notifier: Option, pub(crate) sso_login_callback_port: Option, #[serde(skip)] diff --git a/crates/turborepo-lib/src/shim/local_turbo_config.rs b/crates/turborepo-lib/src/shim/local_turbo_config.rs index 04764b2f3b5ef..352ddb0fd13dd 100644 --- a/crates/turborepo-lib/src/shim/local_turbo_config.rs +++ b/crates/turborepo-lib/src/shim/local_turbo_config.rs @@ -30,10 +30,7 @@ impl LocalTurboConfig { fn infer_internal(repo_state: &RepoState, is_enabled: Option) -> Option { // TODO: once we have properly communicated this functionality we should make // this opt-out. - if !is_enabled.unwrap_or(false) { - debug!("downloading correct local version not enabled"); - return None; - } + debug!("FORCING local turbo binary. Download disabled."); let turbo_version = Self::turbo_version_from_lockfile(repo_state)?; Some(Self { turbo_version }) } diff --git a/crates/turborepo-lib/src/shim/mod.rs b/crates/turborepo-lib/src/shim/mod.rs index 9d4e805ed2b80..7333b6ecfa313 100644 --- a/crates/turborepo-lib/src/shim/mod.rs +++ b/crates/turborepo-lib/src/shim/mod.rs @@ -341,6 +341,7 @@ fn try_check_for_updates( None, interval, package_manager, + config.no_update_notifier.unwrap_or(false) ); } } diff --git a/crates/turborepo-updater/src/lib.rs b/crates/turborepo-updater/src/lib.rs index 553dd3c644c64..a1ae598239e3a 100644 --- a/crates/turborepo-updater/src/lib.rs +++ b/crates/turborepo-updater/src/lib.rs @@ -83,7 +83,11 @@ fn get_tag_from_version(pre: &semver::Prerelease) -> VersionTag { } } -fn should_skip_notification() -> bool { +fn should_skip_notification(config_no_update: bool) -> bool { + if config_no_update { + return true; + } + NOTIFIER_DISABLE_VARS .iter() .chain(ENVIRONMENTAL_DISABLE_VARS.iter()) @@ -99,9 +103,10 @@ pub fn display_update_check( timeout: Option, interval: Option, package_manager: &PackageManager, + config_no_update: bool, ) -> Result<(), UpdateNotifierError> { // bail early if the user has disabled update notifications - if should_skip_notification() { + if should_skip_notification(config_no_update) { return Ok(()); }