From 8f1115532a00d05b0e7c0c3fb1bd594b0ce573a4 Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Tue, 4 Jun 2024 11:03:44 +0200 Subject: [PATCH] Fixed check command --- nix/fixtures/module-repo/flake.lock | 2 +- nix/sweettest.nix | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock index 9fa6c9a..0ad5359 100644 --- a/nix/fixtures/module-repo/flake.lock +++ b/nix/fixtures/module-repo/flake.lock @@ -612,7 +612,7 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-LeSaOjFHZrBzg5Xsy7vfmIe6mOZRBVBPQX10YK2RRfQ=", + "narHash": "sha256-jRJ+uLy62IRvL2+fTcLIFbF4RPllzz+uWf2qpBqjUdk=", "path": "../../..", "type": "path" }, diff --git a/nix/sweettest.nix b/nix/sweettest.nix index ca04fc3..a2d35aa 100644 --- a/nix/sweettest.nix +++ b/nix/sweettest.nix @@ -24,14 +24,12 @@ let cratesNames = builtins.map (toml: toml.package.name) nonWorkspaceCrates; in cratesNames; packageList = listCratesFromWorkspace src; - packages = - builtins.toString (builtins.map (c: " --package ${c}") packageList); workspaceCargoArtifacts = (craneLib.callPackage ./buildDepsOnlyWithArtifacts.nix { }) (commonArgs // { doCheck = false; - cargoBuildCommand = "cargoWorkspace build --tests"; - cargoTestCommand = "cargoWorkspace test"; + cargoBuildCommand = "cargoWorkspace build --tests --locked"; + cargoExtraArgs = ""; cargoCheckCommand = ""; preBuild = '' cargoWorkspace() { @@ -47,22 +45,12 @@ let pname = "workspace-sweettest"; version = cargoToml.package.version; }); - # workspaceCargoArtifacts = - # (craneLib.callPackage ./buildDepsOnlyWithArtifacts.nix { }) (commonArgs // { - # doCheck = false; - # cargoExtraArgs = "--workspace --locked --all-targets"; - - # pname = "workspace-sweettest"; - # version = cargoToml.package.version; - # }); in craneLib.cargoNextest (commonArgs // { cargoArtifacts = workspaceCargoArtifacts; pname = "${crate}-test"; version = cargoToml.package.version; - # cargoTestArgs = "-p ${crate} -j 1"; - # cargoExtraArgs = "--locked"; cargoNextestExtraArgs = "-p ${crate} -j 1"; DNA_PATH = dna;