From a060ac7145f1ffebf24d96986b6b43eee88508f3 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Tue, 4 Jun 2024 11:35:18 +0200 Subject: [PATCH] small fixes --- .github/workflows/ci.yml | 4 ++-- README.md | 4 ++-- tests/integration_test.rs | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bba464c..4eb74f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: environments: default lint - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 with: - key: "pre-commit" + key: pre-commit - name: pre-commit run: pixi run pre-commit-run --color=always --show-diff-on-failure @@ -41,6 +41,6 @@ jobs: uses: prefix-dev/setup-pixi@ba3bb36eb2066252b2363392b7739741bb777659 - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 with: - key: "tests" + key: tests - name: Run test run: pixi run test diff --git a/README.md b/README.md index af6cdb3..1255d2a 100644 --- a/README.md +++ b/README.md @@ -113,9 +113,9 @@ You can then install the environment using `conda` or `micromamba`: ```bash tar --zstd -xvf environment.tar.zstd -micromamba create -p ./env --file environment.yml --override-channels -c "file://$(pwd)/channel" +micromamba create -p ./env --file environment.yml" # or -conda create -p ./env --file environment.yml --override-channels -c "file://$(pwd)/channel" +conda env create -p ./env --file environment.yml" ``` > [!NOTE] diff --git a/tests/integration_test.rs b/tests/integration_test.rs index 855f5d8..887d5f7 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -148,7 +148,12 @@ async fn test_compatibility( } else { vec!["create", "-y", "-p", prefix_str, "-f", "environment.yml"] }; - let output = Command::new(tool) + let tool_exe = if cfg!(windows) { + format!("{}.exe", tool) + } else { + tool.to_string() + }; + let output = Command::new(tool_exe) .args(args) .current_dir(unpack_dir) .output()