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

windows tests: run for only conda-artiq 

Reverts b660ad6, addresses b660ad6723 (commitcomment-33133559)
This commit is contained in:
Astro 2019-04-13 15:50:58 +02:00 committed by Sébastien Bourdeauducq
parent ab9691a01d
commit a0aa821dea
1 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
artiq/windows/default.nix
View File

@ -2,7 +2,7 @@
diskImage ? "/opt/windows/c.img", diskImage ? "/opt/windows/c.img",
qemuMem ? "2G", qemuMem ? "2G",
testTimeout ? 120, testTimeout ? 120,
artiq ? import ./.. { inherit pkgs; }, artiqPkg ? import ../conda-artiq.nix { inherit pkgs; },
}: }:
with pkgs; with pkgs;
@ -43,9 +43,9 @@ let
${ssh "miniconda\\Scripts\\conda install -y -n ${condaEnv} $F"} ${ssh "miniconda\\Scripts\\conda install -y -n ${condaEnv} $F"}
${ssh "del $F"} ${ssh "del $F"}
''; '';
makeTest = name: artiqPkg: in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "windows-test-${name}"; name = "windows-test-conda-artiq";
src = ./.; src = ./.;
dontBuild = true; dontBuild = true;
installPhase = '' installPhase = ''
@ -80,13 +80,4 @@ let
# Power off immediately # Power off immediately
${ssh "shutdown -p -f"} ${ssh "shutdown -p -f"}
''; '';
}; }
condaPackageNames =
builtins.filter (name: builtins.match "conda-.+" name != null)
(builtins.attrNames artiq);
in
builtins.listToAttrs
(map (pkgName: {
name = pkgName;
value = makeTest pkgName artiq.${pkgName};
}) condaPackageNames)