dan/liminix
1
0
Fork 5
Code

simplify CI

Browse Source 
* I didn't know what I was doing when I set up Hydra

* it's not certain that I do now either, but hey ho
This commit is contained in:
Daniel Barlow 2024-10-06 15:55:01 +01:00
parent 336fc7e495
commit ca9efc4b26
13 changed files with 29 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ci.nix
View File

@ -1,11 +1,6 @@
{
nixpkgs,
unstable,
liminix,
...
}:
let
pkgs = (import nixpkgs { });
pkgs = import <nixpkgs> { };
liminix = <liminix>;
borderVmConf = ./bordervm.conf-example.nix;
inherit (pkgs.lib.attrsets) genAttrs;
devices = [
@ -21,7 +16,7 @@ let
vanilla = ./vanilla-configuration.nix;
for-device = name:
(import liminix {
inherit nixpkgs borderVmConf;
inherit borderVmConf;
device = import (liminix + "/devices/${name}");
liminix-config = vanilla;
}).outputs.default;
@ -32,7 +27,7 @@ let
// {
buildEnv =
(import liminix {
inherit nixpkgs borderVmConf;
inherit borderVmConf;
device = import (liminix + "/devices/qemu");
liminix-config = vanilla;
}).buildEnv;
@ -40,7 +35,7 @@ let
let
json =
(import liminix {
inherit nixpkgs borderVmConf;
inherit borderVmConf;
device = import (liminix + "/devices/qemu");
liminix-config =
{ ... }:
@ -74,11 +69,5 @@ let
> $out/nix-support/hydra-build-products
'';
};
with-unstable = (import liminix {
nixpkgs = unstable;
inherit borderVmConf;
device = import (liminix + "/devices/qemu");
liminix-config = vanilla;
}).outputs.default;
};
in jobs
in (genAttrs devices for-device) # tests # jobs

3
default.nix
View File

@ -2,14 +2,13 @@
deviceName ? null,
device ? (import ./devices/${deviceName}),
liminix-config ? <liminix-config>,
nixpkgs ? <nixpkgs>,
borderVmConf ? ./bordervm.conf.nix,
imageType ? "primary",
}:
let
overlay = import ./overlay.nix;
pkgs = import nixpkgs (
pkgs = import <nixpkgs> (
device.system
// {
overlays = [ overlay ];

8
tests/ext4/test.nix
View File

@ -1,9 +1,5 @@
{
liminix
, nixpkgs
}:
let img = (import liminix {
device = import "${liminix}/devices/qemu/";
let img = (import <liminix> {
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.vmroot;
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };

6
tests/fennel/test.nix
View File

@ -1,9 +1,5 @@
{
liminix
, nixpkgs
}:
let
overlay = import "${liminix}/overlay.nix";
overlay = import <liminix/overlay.nix>;
pkgs = import <nixpkgs> { overlays = [overlay]; };
script = pkgs.writeFennel "foo" {} ./hello.fnl;
inherit (pkgs.lua.pkgs) fifo;

8
tests/inout/test.nix
View File

@ -1,9 +1,5 @@
{
liminix
, nixpkgs
}:
let img = (import liminix {
device = import "${liminix}/devices/qemu/";
let img = (import <liminix> {
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.vmroot;
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };

8
tests/jffs2/test.nix
View File

@ -1,9 +1,5 @@
{
liminix
, nixpkgs
}:
let img = (import liminix {
device = import "${liminix}/devices/qemu/";
let img = (import <liminix> {
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.vmroot;
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };

8
tests/min-copy-closure/test.nix
View File

@ -1,9 +1,5 @@
{
liminix
, nixpkgs
}:
let lmx = (import liminix {
device = import "${liminix}/devices/qemu/";
let lmx = (import <liminix> {
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
});
rogue = lmx.pkgs.rogue;

8
tests/pppoe/test.nix
View File

@ -1,9 +1,5 @@
{
liminix
, nixpkgs
}:
let img = (import liminix {
device = import "${liminix}/devices/qemu";
let img = (import <liminix> {
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.default;
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };

8
tests/pseudofiles/test.nix
View File

@ -1,13 +1,9 @@
{
liminix
, nixpkgs
}:
let
overlay = import "${liminix}/overlay.nix";
overlay = import <liminix/overlay.nix>;
nixpkgs = import <nixpkgs> { overlays = [overlay]; };
fixture = nixpkgs.callPackage ./fixture.nix {};
in nixpkgs.runCommand "check" {
nativeBuildInputs = with nixpkgs; [ squashfsTools qprint ] ;
nativeBuildInputs = with <nixpkgs>; [ squashfsTools qprint ] ;
} ''
set -e
diff ${fixture} ${./result.expected}

10
tests/smoke/test.nix
View File

@ -1,10 +1,6 @@
{
liminix
, nixpkgs
}:
let img = (import liminix {
device = import "${liminix}/devices/qemu/";
liminix-config = "${liminix}/vanilla-configuration.nix";
let img = (import <liminix> {
device = import <liminix/devices/qemu>;
liminix-config = <liminix/vanilla-configuration.nix>;
}).outputs.rootfs;
pkgs = import <nixpkgs> {};
in pkgs.runCommand "check" {

7
tests/tftpboot/test.nix
View File

@ -1,9 +1,6 @@
{
liminix
}:
let check = deviceName : config :
let derivation = (import liminix {
device = import "${liminix}/devices/${deviceName}/";
let derivation = (import <liminix> {
device = import (<liminix/devices> + "/${deviceName}");
liminix-config = { ... } : {
imports = [./configuration.nix];
inherit config;

8
tests/updown/test.nix
View File

@ -1,9 +1,5 @@
{
liminix
, nixpkgs
}:
let img = (import liminix {
device = import "${liminix}/devices/qemu/";
let img = (import <liminix> {
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.vmroot;
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };

8
tests/wlan/test.nix
View File

@ -1,9 +1,5 @@
{
liminix
, nixpkgs
}:
let img = (import liminix {
device = import "${liminix}/devices/qemu-armv7l/";
let img = (import <liminix> {
device = import <liminix/devices/qemu-armv7l>;
liminix-config = ./configuration.nix;
}).outputs.default;
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };