Skip to content

Fix noUpdateNotifier not suppressing updates #10941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −8
Draft

Fix noUpdateNotifier not suppressing updates #10941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/turborepo-lib/src/shim/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use tiny_gradient::{GradientStr, RGB};
use tracing::{debug, warn};
pub use turbo_state::TurboState;
use turbo_updater::display_update_check;
use turbo_updater::{display_update_check, should_skip_notification};
use turbopath::AbsoluteSystemPathBuf;
use turborepo_repository::{
inference::{RepoMode, RepoState},
Expand Down Expand Up @@ -313,10 +313,10 @@
current_version: &str,
config: &crate::config::ConfigurationOptions,
package_manager: Result<&PackageManager, &package_manager::Error>,
) {

Check warning on line 316 in crates/turborepo-lib/src/shim/mod.rs

View workflow job for this annotation

GitHub Actions / Rust lints 

Diff in /home/runner/work/turborepo/turborepo/crates/turborepo-lib/src/shim/mod.rs

Check warning on line 316 in crates/turborepo-lib/src/shim/mod.rs

View workflow job for this annotation

GitHub Actions / Rust lints 

Diff in /home/runner/work/turborepo/turborepo/crates/turborepo-lib/src/shim/mod.rs
let package_manager = package_manager.unwrap_or(&PackageManager::Npm);

if args.should_check_for_update() && !config.no_update_notifier() {
if args.should_check_for_update() && !config.no_update_notifier() && !should_skip_notification() {
// custom footer for update message
let footer = format!(
"Follow {username} for updates: {url}",
Expand Down
7 changes: 1 addition & 6 deletions crates/turborepo-updater/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ fn get_tag_from_version(pre: &semver::Prerelease) -> VersionTag {
}
}

fn should_skip_notification() -> bool {
pub fn should_skip_notification() -> bool {
NOTIFIER_DISABLE_VARS
.iter()
.chain(ENVIRONMENTAL_DISABLE_VARS.iter())
Expand All @@ -100,11 +100,6 @@ pub fn display_update_check(
interval: Option<Duration>,
package_manager: &PackageManager,
) -> Result<(), UpdateNotifierError> {
// bail early if the user has disabled update notifications
if should_skip_notification() {
return Ok(());
}

let version = check_for_updates(package_name, current_version, timeout, interval);

if let Ok(Some(version)) = version {
Expand Down
Loading