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

Compare commits

base: M-Labs:90ad4cc31cd2e992cf21906518bd957224379117
Branches Tags
M-Labs:master
..
compare: M-Labs:19fd1a8e5000d3467f71255974121fb1028c0bfc
Branches Tags
M-Labs:master

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

2 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

3
artiq/windows/README.md
View File

@ -3,7 +3,7 @@
## Install a Windows image ## Install a Windows image
```shell ```shell
nix-build install.nix -I artiqSrc=…/artiq nix-build install.nix
result/bin/windows-installer.sh result/bin/windows-installer.sh
``` ```
@ -12,6 +12,7 @@ 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
``` ```

5
artiq/windows/run-test.nix
View File

@ -60,8 +60,7 @@ 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}"}
FAIL=n ${ssh "anaconda\\scripts\\activate ${condaEnv} && ${testCommand}"}
${ssh "anaconda\\scripts\\activate ${condaEnv} && ${testCommand}"} || FAIL=y
# Abort timeouted shutdown # Abort timeouted shutdown
${ssh "shutdown -a"} ${ssh "shutdown -a"}
@ -69,8 +68,6 @@ 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
''; '';