From 59b5ca48ca5c2c2f3aa0b4dfe5e5e6a69c0e5697 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sat, 11 Jan 2025 00:25:10 -0500 Subject: [PATCH] run direnv exec in engage default steps Signed-off-by: strawberry --- .github/workflows/ci.yml | 2 -- engage.toml | 18 +++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ccbf5d92..068582a37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,8 +50,6 @@ env: experimental-features = nix-command flakes extra-experimental-features = nix-command flakes accept-flake-config = true - # complement uses libolm - NIXPKGS_ALLOW_INSECURE: 1 WEB_UPLOAD_SSH_USERNAME: ${{ secrets.WEB_UPLOAD_SSH_USERNAME }} GH_SHA: ${{ github.sha }} GH_REF_NAME: ${{ github.ref_name }} diff --git a/engage.toml b/engage.toml index 9a6ef8cad..1d6a54756 100644 --- a/engage.toml +++ b/engage.toml @@ -97,6 +97,7 @@ env DIRENV_DEVSHELL=all-features \ name = "clippy/default" group = "lints" script = """ +direnv exec . \ cargo clippy \ --workspace \ --profile test \ @@ -126,6 +127,7 @@ env DIRENV_DEVSHELL=all-features \ name = "clippy/jemalloc" group = "lints" script = """ +direnv exec . \ cargo clippy \ --workspace \ --profile test \ @@ -179,13 +181,15 @@ env DIRENV_DEVSHELL=all-features \ name = "cargo/default" group = "tests" script = """ -cargo test \ - --workspace \ - --profile test \ - --all-targets \ - --color=always \ - -- \ - --color=always +env DIRENV_DEVSHELL=default \ + direnv exec . \ + cargo test \ + --workspace \ + --profile test \ + --all-targets \ + --color=always \ + -- \ + --color=always """ # Checks if the generated example config differs from the checked in repo's