Compare commits

..

No commits in common. "90ad4cc31cd2e992cf21906518bd957224379117" and "19fd1a8e5000d3467f71255974121fb1028c0bfc" have entirely different histories.

2 changed files with 3 additions and 5 deletions

View File

@ -3,7 +3,7 @@
## Install a Windows image
```shell
nix-build install.nix -I artiqSrc=…/artiq
nix-build install.nix
result/bin/windows-installer.sh
```
@ -12,6 +12,7 @@ Follow the instructions.
## Install Anaconda to the image
```shell
nix-build install.nix
result/bin/anaconda-installer.sh
```

View File

@ -60,8 +60,7 @@ stdenv.mkDerivation {
# Allow tests to run for 2 minutes
${ssh "shutdown -s -t ${toString testTimeout}"}
FAIL=n
${ssh "anaconda\\scripts\\activate ${condaEnv} && ${testCommand}"} || FAIL=y
${ssh "anaconda\\scripts\\activate ${condaEnv} && ${testCommand}"}
# Abort timeouted shutdown
${ssh "shutdown -a"}
@ -69,8 +68,6 @@ stdenv.mkDerivation {
${ssh "shutdown -p -f"}
wait
[ "\\$FAIL" = "y" ] && exit 1
EOF
chmod a+x $out/bin/run.sh
'';