From 381730d08160145d62ec21e2112756f9d2b3b6d2 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Wed, 20 Sep 2023 21:03:51 +0100
Subject: [PATCH] fix CI flashimage error
---
ci.nix | 12 ++++++++----
vanilla-configuration-hw.nix | 7 +++++++
2 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 vanilla-configuration-hw.nix
diff --git a/ci.nix b/ci.nix
index ce2557fc..a4d051c7 100644
--- a/ci.nix
+++ b/ci.nix
@@ -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 {
diff --git a/vanilla-configuration-hw.nix b/vanilla-configuration-hw.nix
new file mode 100644
index 00000000..45c5e801
--- /dev/null
+++ b/vanilla-configuration-hw.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+ imports = [
+ ./vanilla-configuration.nix
+ ./modules/standard.nix
+ ];
+}