forked from M-Labs/nix-scripts
windows tests: run for only conda-artiq
Reverts b660ad6, addresses b660ad6723 (commitcomment-33133559)
This commit is contained in:
parent
ab9691a01d
commit
a0aa821dea
|
@ -2,7 +2,7 @@
|
|||
diskImage ? "/opt/windows/c.img",
|
||||
qemuMem ? "2G",
|
||||
testTimeout ? 120,
|
||||
artiq ? import ./.. { inherit pkgs; },
|
||||
artiqPkg ? import ../conda-artiq.nix { inherit pkgs; },
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
|
@ -43,9 +43,9 @@ let
|
|||
${ssh "miniconda\\Scripts\\conda install -y -n ${condaEnv} $F"}
|
||||
${ssh "del $F"}
|
||||
'';
|
||||
makeTest = name: artiqPkg:
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "windows-test-${name}";
|
||||
name = "windows-test-conda-artiq";
|
||||
src = ./.;
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
|
@ -80,13 +80,4 @@ let
|
|||
# Power off immediately
|
||||
${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)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue