restore path-based behavior for non-data-model tests

This commit is contained in:
Kiara Grouwstra 2025-09-01 14:48:40 +02:00
parent aefbf47a74
commit 721fb6c6b7
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
5 changed files with 10 additions and 21 deletions

View file

@ -3,10 +3,7 @@
"hello"
"cowsay"
];
pathToRoot = builtins.path {
path = ../../..;
name = "root";
};
pathFromRoot = "/deployment/check/data-model-ssh";
pathToRoot = ../../..;
pathFromRoot = ./.;
useFlake = true;
}

View file

@ -5,11 +5,8 @@
"peertube"
"pixelfed"
];
pathToRoot = builtins.path {
path = ../../..;
name = "root";
};
pathFromRoot = "/deployment/check/data-model-ssh";
pathToRoot = ../../..;
pathFromRoot = ./.;
enableAcme = true;
useFlake = true;
}

View file

@ -32,10 +32,11 @@ in
};
pathFromRoot = mkOption {
type = types.str;
type = types.either types.path types.str;
description = ''
Path from the root of the repository to the working directory.
'';
apply = x: if lib.isString x then x else lib.path.removePrefix config.pathToRoot x;
};
pathToCwd = mkOption {

View file

@ -2,11 +2,8 @@
targetMachines = [
"nixops4"
];
pathToRoot = builtins.path {
path = ../../..;
name = "root";
};
pathFromRoot = "/deployment/check/data-model-ssh";
pathToRoot = ../../..;
pathFromRoot = ./.;
enableAcme = true;
useFlake = true;
}

View file

@ -5,11 +5,8 @@
"peertube"
"pixelfed"
];
pathToRoot = builtins.path {
path = ../../..;
name = "root";
};
pathFromRoot = "/deployment/check/data-model-ssh";
pathToRoot = ../../..;
pathFromRoot = ./.;
enableAcme = true;
useFlake = true;
}