From 09fd2cf946ae28f313a6027d98aff1db9121c5e5 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 8 Nov 2021 17:10:51 +0800 Subject: [PATCH] artiq-fast: temporarily skip Windoze tests for ARTIQ-7 llvmlite needs to be rebuilt, and doing that on top of the anaconda/conda-forge LLVM packages is an even bigger PITA than usual (Visual Studio update required + new incomprehensible conda dep handler bugs). https://github.com/numba/llvmlite/pull/775 https://github.com/numba/llvmlite/pull/702 Users of filthy Microsoft crapware can either install an operating system or wait for upstream and anaconda/conda-forge to update. --- artiq-fast.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/artiq-fast.nix b/artiq-fast.nix index 09e0dce..f008716 100644 --- a/artiq-fast.nix +++ b/artiq-fast.nix @@ -33,10 +33,21 @@ let ''; artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; }; artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; }); - windowsRunner = overrides: + 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: import "${generatedNix}/windows/run-test.nix" ({ inherit pkgs artiqpkgs; - } // overrides); + } // overrides)); jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs); in jobs // {