From 467417c32a5ef8b69a3989d9515607872a2f434f Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Thu, 30 May 2024 00:45:22 -0700 Subject: [PATCH] use all-features devshell for clippy/all in CI Without this, we're building a static rocksdb inside the rust-rocksdb build script every time. As far as I know this doesn't change clippy's behavior, but it does take a *long* time. --- .envrc | 2 +- bin/nix-build-and-cache | 1 + engage.toml | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.envrc b/.envrc index e080e228..56451c1a 100644 --- a/.envrc +++ b/.envrc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -use flake +use flake ".#${DIRENV_DEVSHELL:-default}" PATH_add bin diff --git a/bin/nix-build-and-cache b/bin/nix-build-and-cache index 4c2a8d71..ff06bc96 100755 --- a/bin/nix-build-and-cache +++ b/bin/nix-build-and-cache @@ -51,6 +51,7 @@ ci() { # Keep sorted "$toplevel#devShells.x86_64-linux.default" + "$toplevel#devShells.x86_64-linux.all-features" attic#default nixpkgs#direnv nixpkgs#jq diff --git a/engage.toml b/engage.toml index ec3b4066..3a78a737 100644 --- a/engage.toml +++ b/engage.toml @@ -68,13 +68,15 @@ script = "cargo clippy --workspace --all-targets --color=always -- -D warnings" name = "cargo-clippy/all" group = "lints" script = """ -cargo clippy \ - --workspace \ - --all-targets \ - --all-features \ - --color=always \ - -- \ - -D warnings +env DIRENV_DEVSHELL=all-features \ + direnv exec . \ + cargo clippy \ + --workspace \ + --all-targets \ + --all-features \ + --color=always \ + -- \ + -D warnings """ [[task]]