ci: use run-tests.sh

This commit is contained in:
Erik Arvstedt
2020-12-11 13:27:06 +01:00
parent a82f0f5f48
commit 9977fa69af
3 changed files with 37 additions and 39 deletions
-12
View File
@@ -1,12 +0,0 @@
let
pkgs = import <nixpkgs> {};
nbPkgs = import ../pkgs { inherit pkgs; };
ciPkgs = with nbPkgs; [
electrs
elementsd
hwi
joinmarket
lightning-loop
];
in
pkgs.writeText "ci-pkgs" (pkgs.lib.concatMapStringsSep "\n" toString ciPkgs)
+3 -3
View File
@@ -21,9 +21,9 @@ fi
echo "$NIX_PATH ($(nix eval --raw nixpkgs.lib.version))"
if [[ $scenario ]]; then
buildExpr=$(../test/run-tests.sh --scenario $scenario exprForCI)
testArgs="--scenario $scenario"
else
buildExpr="import ./build.nix"
testArgs=pkgsUnstable
fi
"${BASH_SOURCE[0]%/*}/build-to-cachix.sh" -E "$buildExpr"
"${BASH_SOURCE[0]%/*}/../test/run-tests.sh" --ci $testArgs