ci: use run-tests.sh
This commit is contained in:
@@ -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
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user