Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
23 changes: 1 addition & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ lto = true
opt-level = 3

[dependencies]
async-trait = "0.1"
base64 = "0.22"
bzip2 = "0.5"
calm_io = "0.1"
Expand All @@ -63,7 +64,6 @@ comfy-table = "7.1.3"
confique = { version = "0.3", default-features = false }
console = "0.15"
contracts = "0.6"
crossbeam-channel = "0.5"
demand = "1"
digest = "0.10.7"
dotenvy = "0.15"
Expand All @@ -76,6 +76,8 @@ eyre = "0.6"
filetime = "0.2"
flate2 = "1"
fslock = "0.2.1"
fuzzy-matcher = "0.3"
gix = { version = "<1", features = ["worktree-mutation"] }
glob = "0.3"
globset = "0.4"
heck = "0.5"
Expand All @@ -84,6 +86,7 @@ indexmap = { version = "2", features = ["serde"] }
indicatif = { version = "0.17", features = ["default", "improved_unicode"] }
indoc = "2"
itertools = "0.14"
jiff = "0.2"
junction = "1"
log = "0.4"
minisign-verify = "0.2"
Expand All @@ -96,7 +99,6 @@ os-release = "0.1"
path-absolutize = "3"
petgraph = "0.8"
rand = "0.9"
rayon = "1"
regex = "1"
reqwest = { version = "0.12", default-features = false, features = [
"json",
Expand Down Expand Up @@ -134,11 +136,12 @@ tempfile = "3"
tera = "1"
terminal_size = "0.4"
thiserror = "2"
tokio = { version = "1", features = ["io-std", "rt", "time"] }
tokio = { version = "1", features = ["full"] }
toml = { version = "0.8", features = ["parse"] }
toml_edit = { version = "0.22", features = ["parse"] }
ubi = { version = "0.6.1", default-features = false }
url = "2"
urlencoding = "2.1.3"
usage-lib = { version = "2", features = ["clap", "docs"] }
versions = { version = "6", features = ["serde"] }
# vfox = { path = "../vfox.rs" }
Expand All @@ -149,10 +152,6 @@ xx = { version = "2", features = ["glob"] }
xz2 = "0.1"
zip = { version = "3", default-features = false, features = ["deflate"] }
zstd = "0.13"
gix = { version = "<1", features = ["worktree-mutation"] }
jiff = "0.2"
urlencoding = "2.1.3"
fuzzy-matcher = "0.3.7"

[target.'cfg(unix)'.dependencies]
exec = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions e2e/cli/test_alias
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

mise alias set tiny xxx 2
assert "mise alias set tiny xxx 2"
assert_contains "mise alias ls tiny" "tiny xxx 2"
mise alias unset tiny xxx
assert "mise alias unset tiny xxx"
assert_not_contains "mise alias ls" "tiny xxx"

assert "mise config set alias.nushell aqua:nushell/nushell"
Expand Down
4 changes: 2 additions & 2 deletions e2e/cli/test_local
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

export MISE_USE_TOML=0

mise i dummy@{1,2} tiny@3
assert "mise i dummy@{1,2} tiny@3"

mise local dummy@2
assert "mise local dummy@2 -vv"
assert "mise local" "dummy 2"
assert "mise local --path" "$PWD/.tool-versions"

Expand Down
3 changes: 0 additions & 3 deletions e2e/run_all_tests
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ for index in "${!FILES[@]}"; do
test_count=$((test_count + 1))
done

if [[ -v GITHUB_STEP_SUMMARY ]] && [[ -f "$GITHUB_STEP_SUMMARY-extra" ]]; then
cat "$GITHUB_STEP_SUMMARY-extra" >>"$GITHUB_STEP_SUMMARY"
fi
echo "E2E: ran $test_count tests, skipped $skipped_count tests" >&2

exit "$status"
1 change: 0 additions & 1 deletion e2e/run_test
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ within_isolated_env() {
CARGO_LLVM_COV_SHOW_ENV="${CARGO_LLVM_COV_SHOW_ENV:-}" \
CARGO_LLVM_COV_TARGET_DIR="${CARGO_LLVM_COV_TARGET_DIR:-}" \
GITHUB_ACTION="${GITHUB_ACTION:-}" \
GITHUB_STEP_SUMMARY="${GITHUB_STEP_SUMMARY:-}" \
GITHUB_TOKEN="${GITHUB_TOKEN:-}" \
GOPROXY="${GOPROXY:-}" \
HOME="$TEST_HOME" \
Expand Down
8 changes: 4 additions & 4 deletions src/aqua/aqua_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ impl AquaRegistry {
Ok(Self { path, repo_exists })
}

pub fn package(&self, id: &str) -> Result<AquaPackage> {
pub async fn package(&self, id: &str) -> Result<AquaPackage> {
let path_id = id.split('/').join(std::path::MAIN_SEPARATOR_STR);
let path = self.path.join("pkgs").join(&path_id).join("registry.yaml");
let registry: RegistryYaml = if !self.repo_exists {
Expand All @@ -208,7 +208,7 @@ impl AquaRegistry {
let url: Url =
format!("https://mise-versions.jdx.dev/aqua-registry/{path_id}/registry.yaml")
.parse()?;
http::HTTP_FETCH.download_file(url, &path, None)?;
http::HTTP_FETCH.download_file(url, &path, None).await?;
serde_yaml::from_reader(file::open(&path)?)?
} else {
trace!("reading cached aqua-registry for {id} from {path:?}");
Expand All @@ -229,8 +229,8 @@ impl AquaRegistry {
Ok(pkg)
}

pub fn package_with_version(&self, id: &str, v: &str) -> Result<AquaPackage> {
Ok(self.package(id)?.with_version(v))
pub async fn package_with_version(&self, id: &str, v: &str) -> Result<AquaPackage> {
Ok(self.package(id).await?.with_version(v))
}
}

Expand Down
Loading
Loading