M-Labs
/
nix-scripts
9
0
Fork 8
Code Issues 6 Pull Requests 3 Releases Wiki Activity

Compare commits

base: M-Labs:eee00cea64fe9a0fc35560e3826203170fb1e27f
Branches Tags
M-Labs:master
...
compare: M-Labs:584a232d9a940e090c14aef3834c0eaedf12f6a5
Branches Tags
M-Labs:master

2 Commits
eee00cea64 ... 584a232d9a

Author SHA1 Message Date
Astro 584a232d9a force extended-tests re-run 2019-06-11 23:01:47 +02:00
Astro 87a93802e1 extended-tests: fix ssh path 2019-06-11 23:01:08 +02:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
main.nix
View File

@ -27,7 +27,7 @@ let
generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
''
TMPDIR=`mktemp -d`
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed2
HASH=`nix-hash --type sha256 --base32 $TMPDIR`
echo \"$HASH\" > $out
'';
@ -96,7 +96,7 @@ in
LOCKCTL=$(mktemp -d)
mkfifo $LOCKCTL/lockctl
cat $LOCKCTL/lockctl | ssh rpi-1 'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' | (
cat $LOCKCTL/lockctl | ${pkgs.openssh}/bin/ssh rpi-1 'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' | (
# End remote flock via FIFO
atexit_unlock() {
echo > $LOCKCTL/lockctl
@ -119,7 +119,7 @@ in
)
mkdir $out
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed2
'';
};
}