diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0b26e3f..5c6d74e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -49,9 +49,9 @@ jobs: github_access_token: ${{ secrets.GITHUB_TOKEN }} nix_path: nixpkgs=channel:nixpkgs-unstable - name: Build - run: nix develop .#full --command cargo build --all + run: nix develop .#full --command cargo build --workspace --all-targets - name: Test - run: nix develop .#full --command cargo test --all -- --include-ignored + run: nix develop .#full --command cargo test --workspace --all-targets -- --include-ignored nix-flake: name: Flake package diff --git a/crates/syntax/benches/parse.rs b/crates/syntax/benches/parse.rs index 542e2bb..12e2fce 100644 --- a/crates/syntax/benches/parse.rs +++ b/crates/syntax/benches/parse.rs @@ -4,7 +4,7 @@ use criterion::{BatchSize, Criterion}; use once_cell::sync::Lazy; const TEST_FILES: &[(&str, &str)] = &[ - ("gcc-13", "pkgs/development/compilers/gcc/13/default.nix"), + ("gcc-13", "pkgs/development/compilers/gcc/default.nix"), ("all-packages", "pkgs/top-level/all-packages.nix"), ]; diff --git a/flake.nix b/flake.nix index 6b5afbc..3ca9921 100644 --- a/flake.nix +++ b/flake.nix @@ -85,8 +85,10 @@ rec { fi cargo fmt --all --check \ || die 'Format failed' - cargo clippy --all --all-targets -- ${clippyFlags} \ + cargo clippy --workspace --all-targets -- ${clippyFlags} \ || die 'Clippy failed' + cargo test --workspace --all-targets \ + || die 'Test failed' ( cd editors/coc-nil; npm run lint ) '';