diff --git a/hydra/jobsets.nix b/hydra/jobsets.nix index c9e8e46..1b19102 100644 --- a/hydra/jobsets.nix +++ b/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 = - # name: - # { ref, ... }: - # if ((builtins.match "^refs/heads/(.*)$" ref) == null) then - # null - # else - # { - # name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}"; - # value = makeJob { - # description = "Branch ${name}"; - # flake = "git+ssh://git@github.com/${repo}?ref=${ref}"; - # }; - # }; + jobOfRef = + name: + { ref, ... }: + if ((builtins.match "^refs/heads/(.*)$" ref) == null) then + null + else + { + name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}"; + value = makeJob { + description = "Branch ${name}"; + 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 { diff --git a/hydra/spec.json b/hydra/spec.json index 2d96411..b414f05 100644 --- a/hydra/spec.json +++ b/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 } } }