Put the Ollama tests under a feature

This commit is contained in:
Kerollmops 2025-02-06 17:05:26 +01:00
parent a1d1e7c82a
commit ca1ad51564
No known key found for this signature in database
GPG Key ID: F250A4C4E3AE5F5F
4 changed files with 7 additions and 5 deletions

View File

@ -84,10 +84,10 @@ jobs:
- uses: dtolnay/rust-toolchain@1.81 - uses: dtolnay/rust-toolchain@1.81
- name: Run cargo build with almost all features - name: Run cargo build with almost all features
run: | run: |
cargo build --workspace --locked --release --features "$(cargo xtask list-features --exclude-feature cuda)" cargo build --workspace --locked --release --features "$(cargo xtask list-features --exclude-feature cuda,test-ollama)"
- name: Run cargo test with almost all features - name: Run cargo test with almost all features
run: | run: |
cargo test --workspace --locked --release --features "$(cargo xtask list-features --exclude-feature cuda)" cargo test --workspace --locked --release --features "$(cargo xtask list-features --exclude-feature cuda,test-ollama)"
ollama-ubuntu: ollama-ubuntu:
name: Test with Ollama name: Test with Ollama
@ -119,7 +119,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: test command: test
args: --locked --release --all ollama args: --locked --release --all --features test-ollama ollama
test-disabled-tokenization: test-disabled-tokenization:
name: Test disabled tokenization name: Test disabled tokenization

View File

@ -145,6 +145,7 @@ zip = { version = "2.2.2", optional = true }
[features] [features]
default = ["meilisearch-types/all-tokenizations", "mini-dashboard"] default = ["meilisearch-types/all-tokenizations", "mini-dashboard"]
swagger = ["utoipa-scalar"] swagger = ["utoipa-scalar"]
test-ollama = []
mini-dashboard = [ mini-dashboard = [
"static-files", "static-files",
"anyhow", "anyhow",

View File

@ -1,4 +1,5 @@
mod binary_quantized; mod binary_quantized;
#[cfg(feature = "test-ollama")]
mod ollama; mod ollama;
mod openai; mod openai;
mod rest; mod rest;

View File

@ -6,8 +6,8 @@ use xtask::bench::BenchDeriveArgs;
/// List features available in the workspace /// List features available in the workspace
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
struct ListFeaturesDeriveArgs { struct ListFeaturesDeriveArgs {
/// Feature to exclude from the list. Repeat the argument to exclude multiple features /// Feature to exclude from the list. Use a comma to separate multiple features.
#[arg(short, long)] #[arg(short, long, value_delimiter = ',')]
exclude_feature: Vec<String>, exclude_feature: Vec<String>,
} }