fix CI flashimage error

This commit is contained in:
Daniel Barlow 2023-09-20 21:03:51 +01:00
parent 57eb55de58
commit 381730d081
2 changed files with 15 additions and 4 deletions

12
ci.nix
View File

@ -8,17 +8,21 @@ let
pkgs = (import nixpkgs {});
borderVmConf = ./bordervm.conf-example.nix;
inherit (pkgs.lib.attrsets) genAttrs;
devices = [ "qemu" "gl-ar750" "gl-mt300n-v2" "gl-mt300a" ];
devices = {
virt = [ "qemu" ];
hw = [ "gl-ar750" "gl-mt300n-v2" "gl-mt300a" ];
};
vanilla = ./vanilla-configuration.nix;
for-device = name:
for-device = cfg: name:
(import liminix {
inherit nixpkgs borderVmConf;
device = import (liminix + "/devices/${name}");
liminix-config = vanilla;
liminix-config = cfg;
}).outputs.default;
tests = import ./tests/ci.nix;
jobs =
(genAttrs devices (name: for-device name)) //
(genAttrs devices.hw (name: for-device ./vanilla-configuration-hw.nix name)) //
(genAttrs devices.virt (name: for-device vanilla name)) //
tests //
{
buildEnv = (import liminix {

View File

@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./vanilla-configuration.nix
./modules/standard.nix
];
}