refactor hydra, convert features to refs

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

flake.nix

@@ -186,7 +186,7 @@
     in
     {
       inherit (self) outputs;
-      hydraJobs = import ./.hydra/jobs.nix { inherit inputs outputs; };
+      hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs; };
 
       formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
 

hydra/jobsets.nix

@@ -1,8 +1,8 @@
 {
   nixpkgs,
   pulls,
-  feature-branches,
-  flake-update-branches,
+  branches,
+
   ...
 }:
 let
@@ -25,8 +25,7 @@ let
     };
 
   prs = builtins.fromJSON (builtins.readFile pulls);
-  branches = builtins.fromJSON (builtins.readFile feature-branches);
-  update = builtins.fromJSON (builtins.readFile flake-update-branches);
+  refs = builtins.fromJSON (builtins.readFile refs);
   repo = "ahuston-0/nix-dotfiles-hydra";
 
   makeJob =
@@ -145,10 +144,7 @@ in
   jobsets = makeSpec (
     builtins.listToAttrs (map ({ name, value }: jobOfPR name value) (attrsToList (readJSONFile prs)))
     // builtins.listToAttrs (
-      mapFilter ({ name, value }: jobOfRef name value) (attrsToList (readJSONFile branches))
-    )
-    // builtins.listToAttrs (
-      mapFilter ({ name, value }: jobOfRef name value) (attrsToList (readJSONFile update))
+      mapFilter ({ name, value }: jobOfRef name value) (attrsToList (readJSONFile refs))
     )
     // {
       main = makeJob {

hydra/spec.json

@@ -26,14 +26,9 @@
       "value": "ahuston-0 nix-dotfiles-hydra",
       "emailresponsible": false
     },
-    "feature-branches": {
+    "branches": {
       "type": "github_refs",
-      "value": "ahuston-0 nix-dotfiles-hydra heads - feature",
-      "emailresponsible": false
-    },
-    "flake-update-branches": {
-      "type": "github_refs",
-      "value": "ahuston-0 nix-dotfiles-hydra heads - update_flake_lock_action",
+      "value": "ahuston-0 nix-dotfiles-hydra heads -",
       "emailresponsible": false
     }
   }