diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7de3d8aa8..69e2cf114 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -21,9 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@v4 - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: taiki-e/install-action@cargo-hack - uses: Swatinem/rust-cache@v2 - - uses: rui314/setup-mold@v1 - run: nix develop --impure -c cargo hack --each-feature --all clippy -- -D warnings fmt: @@ -66,8 +64,6 @@ jobs: - uses: DeterminateSystems/nix-installer-action@v4 - uses: DeterminateSystems/magic-nix-cache-action@main - uses: Swatinem/rust-cache@v2 - - uses: rui314/setup-mold@v1 - - uses: taiki-e/install-action@nextest - run: nix develop --impure --command bash -c "unset LD_LIBRARY_PATH && cargo nextest run --all-features" env: DATABASE_URL: "postgres://postgres:postgres@localhost/test_db" diff --git a/flake.nix b/flake.nix index a3917d98c..e72077e12 100644 --- a/flake.nix +++ b/flake.nix @@ -118,6 +118,9 @@ { formatter = pkgs.nixpkgs-fmt; packages = rec { + # Hack to make latest devenv work + devenv-up = self.devShells.${system}.default.config.procfileScript; + default = main; cli = craneLib.buildPackage (commonArgs // rec { @@ -163,6 +166,8 @@ packages = with pkgs; [ cargo-insta diesel-cli + cargo-nextest + cargo-hack rust-bin.stable.latest.default ] ++