ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

refactor hydra, convert features to refs

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-20 13:34:25 -04:00 committed by Alice Huston
parent 13b39a1d26
commit fbaa1f0ac6
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -186,7 +186,7 @@
in in
{ {
inherit (self) outputs; 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); formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);

0
.hydra/jobs.nix → hydra/jobs.nix
View File

12
.hydra/jobsets.nix → hydra/jobsets.nix
View File

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

9
.hydra/spec.json → hydra/spec.json
View File

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