Merge pull request 'add branches to hydra' (#70) from feature/self-hydra into main

Reviewed-on: #70

hydra/jobsets.nix

@@ -1,4 +1,4 @@
-{ pulls, ... }:
+{ pulls, branches, ... }:
 let
   # create the json spec for the jobset
   makeSpec =
@@ -18,7 +18,7 @@ let
     };
 
   prs = readJSONFile pulls;
-  # refs = readJSONFile branches;
+  refs = readJSONFile branches;
 
   # template for creating a job
   makeJob =
@@ -44,20 +44,22 @@ let
       emailoverride = "";
     };
 
+  giteaHost = "ssh://nayeonie.com:2222";
+  repo = "ahuston-0/nix-dotfiles";
   # # Create a hydra job for a branch
-  # jobOfRef =
+  jobOfRef =
-  #   name:
+    name:
-  #   { ref, ... }:
+    { ref, ... }:
-  #   if ((builtins.match "^refs/heads/(.*)$" ref) == null) then
+    if ((builtins.match "^refs/heads/(.*)$" ref) == null) then
-  #     null
+      null
-  #   else
+    else
-  #     {
+      {
-  #       name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}";
+        name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}";
-  #       value = makeJob {
+        value = makeJob {
-  #         description = "Branch ${name}";
+          description = "Branch ${name}";
-  #         flake = "git+ssh://git@github.com/${repo}?ref=${ref}";
+          flake = "git+${giteaHost}/${repo}?ref=${ref}";
-  #       };
+        };
-  #     };
+      };
 
   # Create a hydra job for a PR
   jobOfPR = id: info: {
@@ -75,12 +77,12 @@ let
   # wrapper function for reading json from file
   readJSONFile = f: builtins.fromJSON (builtins.readFile f);
   # remove null values from a set, in-case of branches that don't exist
-  # mapFilter = f: l: builtins.filter (x: (x != null)) (map f l);
+  mapFilter = f: l: builtins.filter (x: (x != null)) (map f l);
 
   # Create job set from PRs and branches
   jobs = makeSpec (
     builtins.listToAttrs (map ({ name, value }: jobOfPR name value) (attrsToList prs))
-    # // builtins.listToAttrs (mapFilter ({ name, value }: jobOfRef name value) (attrsToList refs))
+    // builtins.listToAttrs (mapFilter ({ name, value }: jobOfRef name value) (attrsToList refs))
   );
 in
 {

hydra/spec.json

@@ -25,6 +25,11 @@
       "type": "giteapulls",
       "value": "nayeonie.com ahuston-0 nix-dotfiles https",
       "emailresponsible": false
+    },
+    "branches": {
+      "type": "gitea_refs",
+      "value": "nayeonie.com ahuston-0 nix-dotfiles heads https -",
+      "emailresponsible": false
     }
   }
 }