From 7058a9fc13532eebacc3263dd7ae31d1f004e3a1 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Sat, 20 Apr 2024 15:41:38 -0400
Subject: [PATCH] cleanup & hydra logs

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 hydra/jobsets.nix | 90 +++++++++++------------------------------------
 1 file changed, 20 insertions(+), 70 deletions(-)

diff --git a/hydra/jobsets.nix b/hydra/jobsets.nix
index 4e52639..b50777a 100644
--- a/hydra/jobsets.nix
+++ b/hydra/jobsets.nix
@@ -72,76 +72,7 @@ let
   attrsToList = l: builtins.attrValues (builtins.mapAttrs (name: value: { inherit name value; }) l);
   readJSONFile = f: builtins.fromJSON (builtins.readFile f);
   mapFilter = f: l: builtins.filter (x: !(isNull x)) (map f l);
-in
-# throwJSON = x: throw (builtins.toJSON x);
-# prJobsets = pkgs.lib.mapAttrs (num: info: {
-#   enabled = 1;
-#   hidden = false;
-#   description = "PR ${num}: ${info.title}";
-#   checkinterval = 60;
-#   schedulingshares = 20;
-#   enableemail = false;
-#   emailoverride = "";
-#   keepnr = 1;
-#   type = 1;
-#   flake = "github:ahuston-0/nix-dotfiles-hydra/pull/${num}/head";
-# }) prs;
-# branchJobsets = pkgs.lib.mapAttrs (num: info: {
-#   enabled = 1;
-#   hidden = false;
-#   description = "PR ${num}: ${info.title}";
-#   checkinterval = 60;
-#   schedulingshares = 20;
-#   enableemail = false;
-#   emailoverride = "";
-#   keepnr = 1;
-#   type = 1;
-#   flake = "github:ahuston-0/nix-dotfiles-hydra/pull/${num}/head";
-# }) branches;
-# updateJobsets = pkgs.lib.mapAttrs (num: info: {
-#   enabled = 1;
-#   hidden = false;
-#   description = "PR ${num}: ${info.title}";
-#   checkinterval = 60;
-#   schedulingshares = 20;
-#   enableemail = false;
-#   emailoverride = "";
-#   keepnr = 1;
-#   type = 1;
-#   flake = "github:ahuston-0/nix-dotfiles-hydra/pull/${num}/head";
-# }) prs;
-# mkFlakeJobset = branch: {
-#   description = "Build ${branch}";
-#   checkinterval = "3600";
-#   enabled = "1";
-#   schedulingshares = 100;
-#   enableemail = false;
-#   emailoverride = "";
-#   keepnr = 3;
-#   hidden = false;
-#   type = 1;
-#   flake = "github:ahuston-0/nix-dotfiles-hydra/tree/${branch}";
-# };
-# desc = prJobsets // {
-#   "main" = mkFlakeJobset "main";
-#   "feature-upsync" = mkFlakeJobset "feature/upsync";
-# };
-# log = {
-#   pulls = prs;
-#   jobsets = desc;
-# };
-{
-  # jobsets = pkgs.runCommand "spec-jobsets.json" { } ''
-  #   cat >$out <<EOF
-  #   ${builtins.toJSON desc}
-  #   EOF
-  #   # This is to get nice .jobsets build logs on Hydra
-  #   cat >tmp <<EOF
-  #   ${builtins.toJSON log}
-  #   EOF
-  #   ${pkgs.jq}/bin/jq . tmp
-  # '';
-  jobsets = makeSpec (
+  jobs = makeSpec (
     builtins.listToAttrs (map ({ name, value }: jobOfPR name value) (attrsToList prs))
     // builtins.listToAttrs (mapFilter ({ name, value }: jobOfRef name value) (attrsToList refs))
     // {
@@ -153,4 +84,23 @@ in
       };
     }
   );
+  log = {
+    jobsets = jobs;
+  };
+in
+{
+  jobsets =
+    jobs
+    // pkgs.runCommand "spec-jobsets.json" { } ''
+      cat >$out <<EOF
+      ${prs}
+      ${refs}
+      ${jobs}
+      EOF
+      # This is to get nice .jobsets build logs on Hydra
+      cat >tmp <<EOF
+      ${builtins.toJSON log}
+      EOF
+      ${pkgs.jq}/bin/jq . tmp
+    '';
 }