ci/check: move matrix output

This commit is contained in:
Matt Sturgeon 2025-05-27 15:45:15 +01:00
parent f77ecb989a
commit 0f0dca464e
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
2 changed files with 40 additions and 37 deletions

View file

@ -27,7 +27,7 @@ jobs:
id: set-matrix
run: |
set -Eeu
matrix=$(nix eval --json .#githubActions.matrix)
matrix=$(nix eval --json .#githubActions.checksMatrix)
echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
build:
@ -37,8 +37,7 @@ jobs:
- prepare
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(needs.prepare.outputs.matrix) }}
matrix: ${{ fromJSON(needs.prepare.outputs.matrix) }}
secrets: inherit
with:
systemAsName: true

View file

@ -14,7 +14,7 @@
};
# Output a build matrix for CI
flake.githubActions.matrix =
flake.githubActions =
let
systemsByPrio = [
"x86_64-linux"
@ -41,8 +41,8 @@
) (throw "No supported system found!") systemsByPrio;
in
toGithubBuild system;
in
lib.pipe self.checks [
checks = lib.pipe self.checks [
(lib.mapAttrsRecursiveCond (x: !lib.isDerivation x) (
loc: _: {
_type = "check";
@ -75,4 +75,8 @@
}
))
];
in
{
checksMatrix.include = checks;
};
}