Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
24 changes: 24 additions & 0 deletions e2e/cli/test_hook_env_prefer_offline_no_remote_versions
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,27 @@ EOF

assert_succeed "mise hook-env -s bash --force"
assert_fail "test -f '$HOME/list-all-called'"

credential_marker="$HOME/github-credential-command-called"
credential_command="$HOME/fake-github-credential-command"
cat >"$credential_command" <<EOF
#!/usr/bin/env bash
touch "$credential_marker"
echo fake-token
EOF
chmod +x "$credential_command"

mkdir -p "$MISE_CONFIG_DIR"
cat >"$MISE_CONFIG_DIR/config.toml" <<EOF
[settings]
github.credential_command = "$credential_command"
minimum_release_age = "3d"
EOF

cat >mise.toml <<EOF
[tools]
"github:cli/cli" = "latest"
EOF

assert_succeed "mise hook-env -s bash --force"
assert_fail "test -f '$credential_marker'"
33 changes: 33 additions & 0 deletions e2e/tasks/test_task_skip_tools
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,36 @@ assert "mise run echo-args --skip-tools" "args: --skip-tools"
# verify --skip-tools skips task-level tool installation
# task declares tools = { tiny = "1.0.0" } but --skip-tools prevents install attempt
assert "mise run --skip-tools check-tiny" "ran"

credential_marker="$HOME/github-credential-command-called"
credential_command="$HOME/fake-github-credential-command"
cat >"$credential_command" <<EOF
#!/usr/bin/env bash
touch "$credential_marker"
echo fake-token
EOF
chmod +x "$credential_command"

mkdir -p "$MISE_CONFIG_DIR"
cat >"$MISE_CONFIG_DIR/config.toml" <<EOF
[settings]
auto_install = false
github.credential_command = "$credential_command"
minimum_release_age = "3d"
EOF

cat >mise.toml <<EOF
[tools]
"github:cli/cli" = "latest"

[tasks.nop-test]
run = "echo Hello World!"
EOF

assert "mise run --skip-tools nop-test" "Hello World!"
assert_fail "test -f '$credential_marker'"

rm -f "$credential_marker"

assert "mise run nop-test" "Hello World!"
assert_fail "test -f '$credential_marker'"
10 changes: 9 additions & 1 deletion src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::task::task_list::{get_task_lists, resolve_depends};
use crate::task::task_output::TaskOutput;
use crate::task::task_output_handler::OutputHandler;
use crate::task::{Deps, Task};
use crate::toolset::{InstallOptions, ToolsetBuilder};
use crate::toolset::{InstallOptions, ResolveOptions, ToolsetBuilder};
use crate::ui::{ctrlc, info, style};
use clap::{CommandFactory, ValueHint};
use eyre::{Result, bail, eyre};
Expand Down Expand Up @@ -369,10 +369,18 @@ impl Run {

// Build and install toolset only after tasks resolve. A naked run that
// does not match any task should fail without installing project tools.
// Task startup should not fetch remote version metadata just to build
// the environment. If tools are missing and auto-install is enabled,
// install_missing_versions re-resolves those specific requests online.
let resolve_options = ResolveOptions {
offline: true,
..Default::default()
};
let mut ts = ToolsetBuilder::new()
.with_args(&self.tool)
.with_default_to_latest(true)
.with_config_files(combined_configs)
.with_resolve_options(resolve_options)
.build(&config)
.await?;

Expand Down
28 changes: 28 additions & 0 deletions src/toolset/tool_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,12 @@ impl ToolVersion {
opts.filters_installed_versions() && !is_offline && !prefer_offline;

if v == "latest" {
if prefer_offline && !opts.latest_versions {
if let Some(v) = backend.latest_installed_version(None)? {
return build(v);
}
return build(v);
Comment thread
cursor[bot] marked this conversation as resolved.
Resolved
}
if !opts.latest_versions
&& !should_filter_installed_versions
&& let Some(v) = backend.latest_installed_version(None)?
Expand Down Expand Up @@ -421,6 +427,12 @@ impl ToolVersion {
// zig@master), never an unrelated installed release, so we don't
// short-circuit zig@master to a stable version that happens to be
// installed.
if prefer_offline && !opts.latest_versions {
if let Some(installed) = backend.latest_installed_channel_version(&v) {
return build(installed);
}
return build(v);
}
if !opts.latest_versions
&& !should_filter_installed_versions
&& let Some(installed) = backend.latest_installed_channel_version(&v)
Expand Down Expand Up @@ -456,6 +468,16 @@ impl ToolVersion {
if crate::config::config_file::idiomatic_version::package_json::is_package_json(path)
) && crate::semver::is_npm_semver_range_query(&v)
{
if prefer_offline && !opts.latest_versions {
let installed_versions = backend.list_installed_versions();
if let Some(matches) =
crate::semver::npm_semver_range_filter(&installed_versions, &v)
&& let Some(v) = matches.last()
{
return build(v.clone());
}
return build(v);
}
if !opts.latest_versions && !should_filter_installed_versions {
let installed_versions = backend.list_installed_versions();
if let Some(matches) =
Expand Down Expand Up @@ -584,6 +606,12 @@ impl ToolVersion {
let is_offline = settings.offline() || opts.offline;
let should_filter_installed_versions =
opts.filters_installed_versions() && !is_offline && !settings.prefer_offline();
if settings.prefer_offline() && !opts.latest_versions {
if let Some(v) = backend.list_installed_versions_matching(prefix).last() {
return Ok(Self::new(request, v.to_string()));
}
return Ok(Self::new(request, prefix.to_string()));
}
if !opts.latest_versions
&& !should_filter_installed_versions
&& let Some(v) = backend.list_installed_versions_matching(prefix).last()
Expand Down
Loading