rearrange all the ci stuff

This commit is contained in:
Daniel Barlow 2023-02-05 22:38:21 +00:00
parent ebc5d6a3e0
commit 424abc72b8
6 changed files with 45 additions and 29 deletions

30
ci.nix
View file

@ -1,5 +1,27 @@
{ {
smoke = import ./tests/smoke/test.nix; nixpkgs
pseudofiles = import ./tests/pseudofiles/test.nix; , unstable
pppoe = import ./tests/pppoe/test.nix; , liminix
} , ... }:
let
inherit (builtins) map;
pkgs = (import nixpkgs {});
inherit (pkgs.lib.attrsets) genAttrs;
devices = [ "qemu" "gl-ar750" ];
vanilla = ./vanilla-configuration.nix;
for-device = name:
(import liminix {
inherit nixpkgs;
device = import (liminix + "/devices/${name}");
liminix-config = vanilla;
}).outputs.default;
tests = import ./tests/ci.nix;
jobs =
(genAttrs devices (name: for-device name)) // tests // {
with-unstable = (import liminix {
nixpkgs = unstable;
device = import (liminix + "/devices/qemu");
liminix-config = vanilla;
}).outputs.default;
};
in builtins.trace jobs jobs

View file

@ -1,12 +0,0 @@
{
nixpkgs
, deviceName
, ... }:
let
pkgs = (import nixpkgs {});
device = import "${<liminix/devices>}/${deviceName}";
liminix-config = import <liminix/tests/smoke/configuration.nix>;
liminix = import <liminix> { inherit device liminix-config; };
in {
inherit (liminix.outputs) squashfs kernel default manifest;
}

View file

@ -2,16 +2,17 @@
device device
, liminix-config ? <liminix-config> , liminix-config ? <liminix-config>
, phram ? false , phram ? false
, nixpkgs ? <nixpkgs>
}: }:
let let
overlay = import ./overlay.nix; overlay = import ./overlay.nix;
nixpkgs = import <nixpkgs> (device.system // { pkgs = import nixpkgs (device.system // {
overlays = [overlay device.overlay]; overlays = [overlay device.overlay];
config = {allowUnsupportedSystem = true; }; config = {allowUnsupportedSystem = true; };
}); });
inherit (nixpkgs) callPackage writeText liminix fetchFromGitHub; inherit (pkgs) callPackage writeText liminix fetchFromGitHub;
inherit (nixpkgs.lib) concatStringsSep; inherit (pkgs.lib) concatStringsSep;
config = (import ./merge-modules.nix) [ config = (import ./merge-modules.nix) [
./modules/base.nix ./modules/base.nix
({ lib, ... } : { config = { inherit (device) kernel; }; }) ({ lib, ... } : { config = { inherit (device) kernel; }; })
@ -19,7 +20,7 @@ let
./modules/s6 ./modules/s6
./modules/users.nix ./modules/users.nix
(if phram then ./modules/phram.nix else (args: {})) (if phram then ./modules/phram.nix else (args: {}))
] nixpkgs; ] pkgs;
squashfs = liminix.builders.squashfs config.filesystem.contents; squashfs = liminix.builders.squashfs config.filesystem.contents;
openwrt = fetchFromGitHub { openwrt = fetchFromGitHub {
@ -32,7 +33,7 @@ let
outputs = rec { outputs = rec {
inherit squashfs; inherit squashfs;
kernel = nixpkgs.kernel.override { kernel = pkgs.kernel.override {
inherit (config.kernel) config; inherit (config.kernel) config;
}; };
dtb = (callPackage ./kernel/dtb.nix {}) { dtb = (callPackage ./kernel/dtb.nix {}) {
@ -48,8 +49,8 @@ let
inherit kernel; inherit kernel;
inherit dtb; inherit dtb;
}; };
combined-image = nixpkgs.runCommand "firmware.bin" { combined-image = pkgs.runCommand "firmware.bin" {
nativeBuildInputs = [ nixpkgs.buildPackages.ubootTools ]; nativeBuildInputs = [ pkgs.buildPackages.ubootTools ];
} '' } ''
mkdir $out mkdir $out
dd if=${uimage} of=$out/firmware.bin bs=128k conv=sync dd if=${uimage} of=$out/firmware.bin bs=128k conv=sync
@ -57,13 +58,13 @@ let
''; '';
boot-scr = boot-scr =
let let
inherit (nixpkgs.lib.trivial) toHexString; inherit (pkgs.lib.trivial) toHexString;
uimageStart = 10485760; # 0xa00000 uimageStart = 10485760; # 0xa00000
squashfsStart = uimageStart + 4 * 1024 * 1024; squashfsStart = uimageStart + 4 * 1024 * 1024;
squashfsSize = 8; squashfsSize = 8;
cmd = "mtdparts=phram0:${toString squashfsSize}M(nix) phram.phram=phram0,0x${toHexString squashfsStart},${toString squashfsSize}Mi memmap=${toString squashfsSize}M\$0x${toHexString squashfsStart} root=1f00"; cmd = "mtdparts=phram0:${toString squashfsSize}M(nix) phram.phram=phram0,0x${toHexString squashfsStart},${toString squashfsSize}Mi memmap=${toString squashfsSize}M\$0x${toHexString squashfsStart} root=1f00";
in in
nixpkgs.buildPackages.writeScript "firmware.bin" '' pkgs.buildPackages.writeScript "firmware.bin" ''
setenv serverip 192.168.8.148 setenv serverip 192.168.8.148
setenv ipaddr 192.168.8.251 setenv ipaddr 192.168.8.251
setenv bootargs '${concatStringsSep " " config.boot.commandLine} ${cmd}' setenv bootargs '${concatStringsSep " " config.boot.commandLine} ${cmd}'
@ -71,7 +72,7 @@ let
bootm 0x${toHexString uimageStart} bootm 0x${toHexString uimageStart}
''; '';
directory = nixpkgs.runCommand "liminix" {} ('' directory = pkgs.runCommand "liminix" {} (''
mkdir $out mkdir $out
cd $out cd $out
ln -s ${squashfs} squashfs ln -s ${squashfs} squashfs
@ -87,12 +88,12 @@ let
# this exists so that you can run "nix-store -q --tree" on it and find # this exists so that you can run "nix-store -q --tree" on it and find
# out what's in the image, which is nice if it's unexpectedly huge # out what's in the image, which is nice if it's unexpectedly huge
manifest = writeText "manifest.json" (builtins.toJSON config.filesystem.contents); manifest = writeText "manifest.json" (builtins.toJSON config.filesystem.contents);
tftpd = nixpkgs.buildPackages.tufted; tftpd = pkgs.buildPackages.tufted;
}; };
in { in {
outputs = outputs // { default = outputs.${device.outputs.default}; }; outputs = outputs // { default = outputs.${device.outputs.default}; };
# this is just here as a convenience, so that we can get a # this is just here as a convenience, so that we can get a
# cross-compiling nix-shell for any package we're customizing # cross-compiling nix-shell for any package we're customizing
inherit (nixpkgs) pkgs; inherit pkgs;
} }

5
tests/ci.nix Normal file
View file

@ -0,0 +1,5 @@
{
smoke = import ./smoke/test.nix;
pseudofiles = import ./pseudofiles/test.nix;
pppoe = import ./pppoe/test.nix;
}

View file

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