Compare commits

..

No commits in common. "0dae4220bfe848cada97e7847d1d9db07c3b58d5" and "0f33ddf0d7d8db9a92e5e0ebb5a1509526078893" have entirely different histories.

1 changed files with 3 additions and 7 deletions

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/passed9
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed8
HASH=`nix-hash --type sha256 --base32 $TMPDIR`
echo \"$HASH\" > $out
'';
@ -96,11 +96,7 @@ in
LOCKCTL=$(mktemp -d)
mkfifo $LOCKCTL/lockctl
cat $LOCKCTL/lockctl | ${pkgs.openssh}/bin/ssh \
-o UserKnownHostsFile=$HOME/.ssh/known_hosts \
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
@ -123,7 +119,7 @@ in
)
mkdir $out
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed9
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed8
'';
};
}