Skip to content

Commit

Permalink
fix(cli): fix bad merge conflict resolution (#8035)
Browse files Browse the repository at this point in the history
### Description

I messed up a resolving a merge conflict and didn't migrate some args
that moved from `ExecutionArgs` to `RunArgs` in #7613

### Testing Instructions

Tests on CI pass

Closes TURBO-2872
  • Loading branch information
chris-olszewski committed May 28, 2024
1 parent 5108c2d commit cb1485a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 40 deletions.
23 changes: 1 addition & 22 deletions crates/turborepo-lib/src/cli/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use clap::{
use clap_complete::{generate, Shell};
pub use error::Error;
use serde::{Deserialize, Serialize};
use tracing::{debug, error, warn};
use tracing::{debug, error};
use turbopath::AbsoluteSystemPathBuf;
use turborepo_api_client::AnonAPIClient;
use turborepo_repository::inference::{RepoMode, RepoState};
Expand Down Expand Up @@ -695,24 +695,6 @@ pub struct ExecutionArgs {
#[clap(long, requires = "scope-filter-group")]
pub ignore: Vec<String>,

/// Avoid saving task results to the cache. Useful for development/watch
/// tasks.
#[clap(long)]
pub no_cache: bool,

// clap does not have negation flags such as --daemon and --no-daemon
// so we need to use a group to enforce that only one of them is set.
// we set the long name as [no-]daemon with an alias of daemon such
// that we can merge the help text together for both flags
// -----------------------
#[clap(long = "daemon", group = "daemon-group")]
daemon: bool,

/// Force turbo to either use or not use the local daemon. If unset
/// turbo will use the default detection logic.
#[clap(long, group = "daemon-group")]
no_daemon: bool,

/// Set type of process output logging. Use "full" to show
/// all output. Use "hash-only" to show only turbo-computed
/// task hashes. Use "new-only" to show only new output with
Expand Down Expand Up @@ -759,9 +741,6 @@ impl ExecutionArgs {

track_usage!(telemetry, self.continue_execution, |val| val);
track_usage!(telemetry, self.single_package, |val| val);
track_usage!(telemetry, self.no_cache, |val| val);
track_usage!(telemetry, self.daemon, |val| val);
track_usage!(telemetry, self.no_daemon, |val| val);
track_usage!(telemetry, self.only, |val| val);
track_usage!(telemetry, self.remote_only, |val| val);
track_usage!(telemetry, &self.cache_dir, Option::is_some);
Expand Down
6 changes: 0 additions & 6 deletions turborepo-tests/integration/tests/no-args.t
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ Make sure exit code is 2 when no args are passed
Use the given selector to specify package(s) to act as entry points. The syntax mirrors pnpm's syntax, and additional documentation and examples can be found in turbo's documentation https://turbo.build/repo/docs/reference/command-line-reference/run#--filter
--ignore <IGNORE>
Files to ignore when calculating changed files from '--filter'. Supports globs
--no-cache
Avoid saving task results to the cache. Useful for development/watch tasks
--daemon

--no-daemon
Force turbo to either use or not use the local daemon. If unset turbo will use the default detection logic
--output-logs <OUTPUT_LOGS>
Set type of process output logging. Use "full" to show all output. Use "hash-only" to show only turbo-computed task hashes. Use "new-only" to show only new output with only hashes for cached tasks. Use "none" to hide process output. (default full) [possible values: full, none, hash-only, new-only, errors-only]
--log-order <LOG_ORDER>
Expand Down
12 changes: 0 additions & 12 deletions turborepo-tests/integration/tests/turbo-help.t
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ Test help flag
Use the given selector to specify package(s) to act as entry points. The syntax mirrors pnpm's syntax, and additional documentation and examples can be found in turbo's documentation https://turbo.build/repo/docs/reference/command-line-reference/run#--filter
--ignore <IGNORE>
Files to ignore when calculating changed files from '--filter'. Supports globs
--no-cache
Avoid saving task results to the cache. Useful for development/watch tasks
--daemon

--no-daemon
Force turbo to either use or not use the local daemon. If unset turbo will use the default detection logic
--output-logs <OUTPUT_LOGS>
Set type of process output logging. Use "full" to show all output. Use "hash-only" to show only turbo-computed task hashes. Use "new-only" to show only new output with only hashes for cached tasks. Use "none" to hide process output. (default full) [possible values: full, none, hash-only, new-only, errors-only]
--log-order <LOG_ORDER>
Expand Down Expand Up @@ -184,12 +178,6 @@ Test help flag
Use the given selector to specify package(s) to act as entry points. The syntax mirrors pnpm's syntax, and additional documentation and examples can be found in turbo's documentation https://turbo.build/repo/docs/reference/command-line-reference/run#--filter
--ignore <IGNORE>
Files to ignore when calculating changed files from '--filter'. Supports globs
--no-cache
Avoid saving task results to the cache. Useful for development/watch tasks
--daemon

--no-daemon
Force turbo to either use or not use the local daemon. If unset turbo will use the default detection logic
--output-logs <OUTPUT_LOGS>
Set type of process output logging. Use "full" to show all output. Use "hash-only" to show only turbo-computed task hashes. Use "new-only" to show only new output with only hashes for cached tasks. Use "none" to hide process output. (default full) [possible values: full, none, hash-only, new-only, errors-only]
--log-order <LOG_ORDER>
Expand Down

0 comments on commit cb1485a

Please sign in to comment.