From a3240b8fee8658cd2e316dc64ce462c8b89111e1 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 14 Dec 2021 18:22:32 +0800
Subject: [PATCH] Revert "artiq-fast: temporarily skip Windoze tests for
 ARTIQ-7"

This reverts commit 09fd2cf946ae28f313a6027d98aff1db9121c5e5.
---
 artiq-fast.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

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 // {