From ecfafc8c511c94ad302fd11b60aa2fce1a0be186 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Thu, 13 May 2021 18:44:32 +0100
Subject: [PATCH] ci: Fixes to jobs (they have a task now)

---
 ci.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/ci.nix b/ci.nix
index d54b5ff4..4846be96 100644
--- a/ci.nix
+++ b/ci.nix
@@ -1,22 +1,14 @@
-{ lib, channels, ... }: with lib; {
+{ lib, channels, ... }: with lib; let
+  nixfiles = import ./.; 
+in {
   name = "nixfiles";
   ci.gh-actions.enable = true;
   ci.gh-actions.export = true;
 
   jobs = let hostnames = [ "samhain" "yule" "athame" ];
   in mapAttrs' (k: nameValuePair "host-${k}") (genAttrs hostnames (host: {
-      tasks = {
-      inputs = with channels.cipkgs; ci.command {
-        name = "build-${host}";
-        displayName = "build hosts/${host}";
-        nativeBuildInputs = [ nix ];
-        command = ''
-          nix build -Lf . hosts.${host}.config.system.build.toplevel --show-trace --no-link
-          nix-collect-garbage
-        '';
-      };
-    };
-    }));
+      tasks.${host}.inputs = nixfiles.hosts.${host}.config.system.build.toplevel;
+  }));
 
   ci.gh-actions.checkoutOptions.submodules = false;
   cache.cachix.arc = {