forked from M-Labs/nix-scripts
Revert "artiq-fast: temporarily skip Windoze tests for ARTIQ-7"
This reverts commit 09fd2cf946
.
This commit is contained in:
parent
926582acbd
commit
a3240b8fee
|
@ -33,21 +33,10 @@ let
|
||||||
'';
|
'';
|
||||||
artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; };
|
artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; };
|
||||||
artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; });
|
artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; });
|
||||||
windowsRunner =
|
windowsRunner = overrides:
|
||||||
if (pkgs.lib.versionAtLeast artiqVersion "7.0")
|
|
||||||
then
|
|
||||||
(overrides:
|
|
||||||
pkgs.writeScriptBin "wfvm-run-windows-tests"
|
|
||||||
''
|
|
||||||
${pkgs.bash}/bin/bash
|
|
||||||
echo "Windows tests skipped"
|
|
||||||
''
|
|
||||||
)
|
|
||||||
else
|
|
||||||
(overrides:
|
|
||||||
import "${generatedNix}/windows/run-test.nix" ({
|
import "${generatedNix}/windows/run-test.nix" ({
|
||||||
inherit pkgs artiqpkgs;
|
inherit pkgs artiqpkgs;
|
||||||
} // overrides));
|
} // overrides);
|
||||||
jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs);
|
jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs);
|
||||||
in
|
in
|
||||||
jobs // {
|
jobs // {
|
||||||
|
|
Loading…
Reference in New Issue