From 032237634be88d7e22cb569a5d6a895a8b8255bd Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sun, 25 May 2025 23:23:32 +0100 Subject: [PATCH] ci: fix references to attr --- flake/dev/tests.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/flake/dev/tests.nix b/flake/dev/tests.nix index 65585e28..19ea383f 100644 --- a/flake/dev/tests.nix +++ b/flake/dev/tests.nix @@ -51,8 +51,8 @@ } )) (lib.collect (lib.isType "check")) - (lib.groupBy' (acc: x: acc ++ [ x.build ]) [ ] (x: x.attr)) - (lib.mapAttrsToList (attr: builds: { inherit attr builds; })) + (lib.groupBy' (builds: x: builds ++ [ x.build ]) [ ] (x: x.name)) + (lib.mapAttrsToList (name: builds: { inherit name builds; })) # Only build one one system for non-test attrs # TODO: this is very heavy handed, maybe we want some exceptions? @@ -71,13 +71,7 @@ matrix: matrix // { - builds = map ( - build: - build - // { - attr = "checks.${build.system}.${matrix.name}"; - } - ) matrix.builds; + builds = map (build: build // { attr = "checks.${build.system}.${matrix.name}"; }) matrix.builds; } )) ];