From 98a5117ab9784ec58d174f487ef9f2d3a8f3842b Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Fri, 29 Sep 2023 13:47:30 +0200 Subject: [PATCH] CI: Run it in a nix develop shell --- .forgejo/workflows/ci.yaml | 6 +----- flake.nix | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index d3e72b4..03d9e87 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -9,10 +9,6 @@ jobs: steps: - uses: actions/checkout@v3 name: Checkout - - name: Set up Cachix - run: | - nix-env -iA nixpkgs.cachix nixpkgs.bash - cachix use $CACHIX_NAME - name: Build run: | - cachix watch-exec $CACHIX_NAME nix build + nix develop --command bash --command 'cachix use $CACHIX_NAME && cachix watch-exec $CACHIX_NAME nix build' diff --git a/flake.nix b/flake.nix index 42145c2..a94d972 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ # For `nix develop`: devShell = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ rustc cargo ]; + nativeBuildInputs = with pkgs; [ rustc cargo cachix ]; }; } );