From 35d31a1baf96fe6f0e764e26228c1b03ba24ddce Mon Sep 17 00:00:00 2001 From: jdx <216188+jdx@users.noreply.github.com> Date: Fri, 29 Nov 2024 17:00:34 -0600 Subject: [PATCH] fix: do not auto-install on `mise x` if some tools are passed --- .github/workflows/autofix.yml | 1 + .github/workflows/docs.yml | 1 + .github/workflows/hyperfine.yml | 1 + .github/workflows/release-plz.yml | 1 + .github/workflows/release.yml | 1 + .github/workflows/test.yml | 10 +++++++--- src/cli/exec.rs | 6 +++++- 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index 2b7786c481..989284abe5 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -41,6 +41,7 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise install - run: mise x -- bun i - run: mise run render diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a1e4994837..b0eca0e97b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -33,6 +33,7 @@ jobs: with: install_args: bun cache: true + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: bun i - run: mise run docs:release env: diff --git a/.github/workflows/hyperfine.yml b/.github/workflows/hyperfine.yml index 324040055e..6fe6d9f229 100644 --- a/.github/workflows/hyperfine.yml +++ b/.github/workflows/hyperfine.yml @@ -57,6 +57,7 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise install - run: | CMDS=( diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml index 361b8a7a82..7759388994 100644 --- a/.github/workflows/release-plz.yml +++ b/.github/workflows/release-plz.yml @@ -50,6 +50,7 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise install - run: mise x -- bun i - run: mise run release-plz diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 72641491a9..adfd707e43 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -156,6 +156,7 @@ jobs: - run: tar -C "$HOME" -xvJf "dist/mise-$(./scripts/get-version.sh)-linux-x64.tar.xz" - run: echo "$HOME/mise/bin" >> "$GITHUB_PATH" - run: mise -v + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise i - name: Run e2e tests uses: nick-fields/retry@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f381c05716..043f863608 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,8 +53,8 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise i - - run: mise x -- wait-for-gh-rate-limit build-macos: runs-on: macos-latest @@ -108,8 +108,8 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise i - - run: mise x -- wait-for-gh-rate-limit unit: strategy: @@ -147,6 +147,7 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise install - run: mise x -- bun i - run: mise x -- cargo test --all-features @@ -178,6 +179,7 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise install - run: mise run test:shuffle @@ -220,7 +222,7 @@ jobs: ~/.local/share/mise ~/.cache/mise - run: echo "$PWD/target/debug" >> "$GITHUB_PATH" && chmod +x target/debug/mise - - run: mise x -- wait-for-gh-rate-limit + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - name: Test w/ coverage uses: nick-fields/retry@v3 env: @@ -271,6 +273,7 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise install - name: e2e uses: nick-fields/retry@v3 @@ -315,6 +318,7 @@ jobs: path: | ~/.local/share/mise ~/.cache/mise + - run: mise x wait-for-gh-rate-limit -- wait-for-gh-rate-limit - run: mise install - uses: nick-fields/retry@v3 with: diff --git a/src/cli/exec.rs b/src/cli/exec.rs index eba905f51c..73a83d33a1 100644 --- a/src/cli/exec.rs +++ b/src/cli/exec.rs @@ -64,7 +64,11 @@ impl Exec { jobs: self.jobs, raw: self.raw, // prevent installing things in shims by checking for tty - missing_args_only: !SETTINGS.exec_auto_install || !console::user_attended_stderr(), + // also don't autoinstall if at least 1 tool is specified + // in that case the user probably just wants that one tool + missing_args_only: !self.tool.is_empty() + || !SETTINGS.exec_auto_install + || !console::user_attended_stderr(), resolve_options: Default::default(), }; measure!("install_arg_versions", {