diff --git a/artiq-fast.nix b/artiq-fast.nix index 6084efe..dc7d08e 100644 --- a/artiq-fast.nix +++ b/artiq-fast.nix @@ -33,21 +33,10 @@ let ''; artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; }; artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; }); - windowsRunner = - 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: + windowsRunner = overrides: import "${generatedNix}/windows/run-test.nix" ({ inherit pkgs artiqpkgs; - } // overrides)); + } // overrides); jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs); in jobs // {