Skip to content

Commit

Permalink
Merge branch 'main' into feat/index-strategy
Browse files Browse the repository at this point in the history
  • Loading branch information
baszalmstra authored Sep 10, 2024
2 parents 8de9167 + 2be7e4f commit fb6e6ec
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ jobs:
strategy:
fail-fast: false
matrix:
main: "${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}"
include:
- {
name: "Linux",
Expand All @@ -120,9 +119,6 @@ jobs:
target: x86_64-pc-windows-msvc,
os: 16core_windows_latest_runner,
}
exclude:
- target: "x86_64-apple-darwin"
main: false

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions src/cli/clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ pub struct CacheArgs {
pub repodata: bool,

/// Answer yes to all questions.
#[arg(long)]
pub yes: bool,
#[clap(short = 'y', long = "yes", long = "assume-yes")]
assume_yes: bool,
// TODO: Would be amazing to have a --unused flag to clean only the unused cache.
// By searching the inode count of the packages and removing based on that.
// #[arg(long)]
Expand Down Expand Up @@ -139,7 +139,7 @@ async fn clean_cache(args: CacheArgs) -> miette::Result<()> {
if args.exec {
dirs.push(cache_dir.join(consts::CACHED_ENVS_DIR));
}
if dirs.is_empty() && (args.yes || dialoguer::Confirm::new()
if dirs.is_empty() && (args.assume_yes || dialoguer::Confirm::new()
.with_prompt("No cache types specified using the flags.\nDo you really want to remove all cache directories from your machine?")
.interact_opt()
.into_diagnostic()?
Expand Down

0 comments on commit fb6e6ec

Please sign in to comment.