Compare commits
2 Commits
19fd1a8e50
...
90ad4cc31c
Author | SHA1 | Date |
---|---|---|
Astro | 90ad4cc31c | |
Astro | 287fb4a28b |
|
@ -3,7 +3,7 @@
|
||||||
## Install a Windows image
|
## Install a Windows image
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
nix-build install.nix
|
nix-build install.nix -I artiqSrc=…/artiq
|
||||||
result/bin/windows-installer.sh
|
result/bin/windows-installer.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -12,7 +12,6 @@ Follow the instructions.
|
||||||
## Install Anaconda to the image
|
## Install Anaconda to the image
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
nix-build install.nix
|
|
||||||
result/bin/anaconda-installer.sh
|
result/bin/anaconda-installer.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,8 @@ stdenv.mkDerivation {
|
||||||
# Allow tests to run for 2 minutes
|
# Allow tests to run for 2 minutes
|
||||||
${ssh "shutdown -s -t ${toString testTimeout}"}
|
${ssh "shutdown -s -t ${toString testTimeout}"}
|
||||||
|
|
||||||
${ssh "anaconda\\scripts\\activate ${condaEnv} && ${testCommand}"}
|
FAIL=n
|
||||||
|
${ssh "anaconda\\scripts\\activate ${condaEnv} && ${testCommand}"} || FAIL=y
|
||||||
|
|
||||||
# Abort timeouted shutdown
|
# Abort timeouted shutdown
|
||||||
${ssh "shutdown -a"}
|
${ssh "shutdown -a"}
|
||||||
|
@ -68,6 +69,8 @@ stdenv.mkDerivation {
|
||||||
${ssh "shutdown -p -f"}
|
${ssh "shutdown -p -f"}
|
||||||
wait
|
wait
|
||||||
|
|
||||||
|
[ "\\$FAIL" = "y" ] && exit 1
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
chmod a+x $out/bin/run.sh
|
chmod a+x $out/bin/run.sh
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in New Issue