From 6f1fe6b610e84c6b9dcb08eba30fabbcc717d3b5 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Wed, 5 Jun 2024 23:21:38 +0200 Subject: [PATCH] . --- .github/workflows/ci.yml | 2 -- pixi.toml | 1 - tests/integration_test.rs | 13 +++++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6b80f7..14f24e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,5 @@ jobs: - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 with: key: tests - - name: Run clippy - run: pixi run clippy --color always${{ startsWith(matrix.os, 'ubuntu-latest') && ' --no-default-features --features rustls-tls' || '' }} - name: Run test run: pixi run test --color always${{ startsWith(matrix.os, 'ubuntu-latest') && ' --no-default-features --features rustls-tls' || '' }} diff --git a/pixi.toml b/pixi.toml index 386ddd6..e21dac6 100644 --- a/pixi.toml +++ b/pixi.toml @@ -8,7 +8,6 @@ platforms = ["osx-arm64", "osx-64", "linux-64", "linux-aarch64", "win-64"] [tasks] build = "cargo build --release" test = "cargo test" -clippy = "cargo clippy" [dependencies] rust = "1.77.2" diff --git a/tests/integration_test.rs b/tests/integration_test.rs index 0b197bc..5206c3c 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -73,7 +73,13 @@ fn required_fs_objects() -> Vec<&'static str> { openssl_required_file, ]) } else { - required_fs_objects.extend(vec!["bin/python", "lib", "man", "ssl", openssl_required_file]); + required_fs_objects.extend(vec![ + "bin/python", + "lib", + "man", + "ssl", + openssl_required_file, + ]); } required_fs_objects } @@ -105,7 +111,10 @@ async fn test_simple_python(options: Options, required_fs_objects: Vec<&'static }); } -#[cfg(not(target_os = "windows"))] // https://github.com/Quantco/pixi-pack/issues/8 +// https://github.com/Quantco/pixi-pack/issues/8 +#[cfg(not(target_os = "windows"))] +#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))] +#[cfg(not(all(target_os = "macos", target_arch = "x86_64")))] #[rstest] #[case("conda")] #[case("micromamba")]