From 5a84d686f7a21d8131c9d0639a1b56e2ccd83389 Mon Sep 17 00:00:00 2001
From: jdx <216188+jdx@users.noreply.github.com>
Date: Thu, 10 Jul 2025 16:28:24 -0500
Subject: [PATCH 1/2] chore: added xonsh for release builds

---
 .github/workflows/test.yml | 1 -
 e2e/run_test               | 2 +-
 e2e/shell/test_xonsh       | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0327b928b1..42404c66ed 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -203,7 +203,6 @@ jobs:
             pipx \
             python3-venv \
             zsh
-          sudo pip3 install xonsh
       - run: |
           mkdir -p "$HOME/.local/bin"
           ln -s "$(which fdfind)" "$HOME/.local/bin/fd"
diff --git a/e2e/run_test b/e2e/run_test
index 28571d9806..de7e58d36c 100755
--- a/e2e/run_test
+++ b/e2e/run_test
@@ -76,7 +76,7 @@ within_isolated_env() {
     MISE_TRUSTED_CONFIG_PATHS="$TEST_ISOLATED_DIR" \
     MISE_USE_VERSIONS_HOST="${MISE_USE_VERSIONS_HOST:-1}" \
     MISE_YES=1 \
-    PATH="${CARGO_TARGET_DIR:-$ROOT/target}/debug:$HOME/mise/bin:$CARGO_HOME/bin:$TEST_HOME/bin:/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin:/usr/local/bin:/usr/bin:/bin" \
+    PATH="${CARGO_TARGET_DIR:-$ROOT/target}/debug:$HOME/mise/bin:$CARGO_HOME/bin:$TEST_HOME/bin:$HOME/.local/bin:/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin:/usr/local/bin:/usr/bin:/bin" \
     ROOT="$ROOT" \
     RUSTUP_HOME="$RUSTUP_HOME" \
     RUST_BACKTRACE="${RUST_BACKTRACE:-1}" \
diff --git a/e2e/shell/test_xonsh b/e2e/shell/test_xonsh
index 9713750580..1e60151b8e 100644
--- a/e2e/shell/test_xonsh
+++ b/e2e/shell/test_xonsh
@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
-require_cmd xonsh
-exec xonsh --no-rc "$TEST_DIR/xonsh_script"
+exec mise x 'pipx:xonsh[full]' -- xonsh --no-rc "$TEST_DIR/xonsh_script"

From 5a142d6f95a036011bb068c495d720256c961cfc Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 09:46:14 +0000
Subject: [PATCH 2/2] [autofix.ci] apply automated fixes

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 886a5dc224..be2da6e28a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3754,7 +3754,7 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "built",
- "bzip2 0.5.2",
+ "bzip2 0.6.0",
  "calm_io",
  "cfg_aliases",
  "chrono",