feat: add CI, improve benchmark, fix issue statix created and remove statix

This commit is contained in:
technofab 2025-09-15 13:10:48 +02:00
parent 5fee6ef12a
commit 560aaf0f15
No known key found for this signature in database
9 changed files with 118 additions and 13 deletions

5
.gitlab-ci.yml Normal file
View file

@ -0,0 +1,5 @@
# Generated by soonix, DO NOT EDIT
include:
- component: gitlab.com/TECHNOFAB/nix-gitlab-ci/nix-gitlab-ci@3.0.0-alpha.2
inputs:
version: 3.0.0-alpha.2

6
flake.lock generated
View file

@ -37,11 +37,11 @@
}, },
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1755264589, "lastModified": 1756370106,
"narHash": "sha256-g8KjU4D/nxpMjCLQNP90VAAWUH89yvONRfChyhhzq4c=", "narHash": "sha256-l84ojcHuQWBwn4BRxQsMMfQpcq/Az/sHh/hSqFgVtyg=",
"owner": "rensa-nix", "owner": "rensa-nix",
"repo": "core", "repo": "core",
"rev": "9f20f8c94b09a1c85356f8340ebe0a339b0d32e6", "rev": "9c1a29fa9ba7cbbb78b9e47eb8afbcd29303a3b4",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

View file

@ -23,6 +23,7 @@
(simple "tests") (simple "tests")
(simple "benchmark") (simple "benchmark")
(simple "docs") (simple "docs")
(simple "ci")
]; ];
} }
{ {
@ -30,6 +31,7 @@
["repo" "tests"] ["repo" "tests"]
["repo" "benchmark"] ["repo" "benchmark"]
["repo" "docs"] ["repo" "docs"]
["repo" "ci" "packages"]
]; ];
}; };
} }

View file

@ -13,7 +13,7 @@
prefix, prefix,
... ...
} @ args: let } @ args: let
vals = filter (key: args.${key} != null && args.${key}) [ vals = filter (key: args.${key} != null && args.${key} != false) [
"eval" "eval"
"prefix" "prefix"
"unset" "unset"

View file

@ -6,13 +6,13 @@ in {
runtimeInputs = [pkgs.hyperfine]; runtimeInputs = [pkgs.hyperfine];
text = '' text = ''
echo "Comparison cases first:" echo "Comparison cases first:"
hyperfine -w 3 \ hyperfine -w 5 \
'nix-instantiate ${inputs.self}/benchmark/shared.nix' \ 'nix-instantiate ${inputs.self}/benchmark/shared.nix --quiet --quiet --quiet' \
'nix-instantiate ${inputs.self}/benchmark/empty.nix' 'nix-instantiate ${inputs.self}/benchmark/empty.nix --quiet --quiet --quiet'
echo "Now real benchmark:" echo "Now real benchmark:"
hyperfine -w 3 \ hyperfine -w 5 \
'nix-instantiate ${inputs.self}/benchmark/nixpkgs-shell.nix' \ 'nix-instantiate ${inputs.self}/benchmark/nixpkgs-shell.nix --quiet --quiet --quiet' \
'nix-instantiate ${inputs.self}/benchmark/devshell.nix' 'nix-instantiate ${inputs.self}/benchmark/devshell.nix --quiet --quiet --quiet'
''; '';
}; };
} }

51
nix/repo/ci.nix Normal file
View file

@ -0,0 +1,51 @@
{inputs, ...}: let
inherit (inputs) cilib;
in
cilib.mkCI {
pipelines."default" = {
stages = ["test" "build" "deploy"];
jobs = {
"test" = {
stage = "test";
script = [
"nix run .#tests -- --junit=junit.xml"
];
allow_failure = true;
artifacts = {
when = "always";
reports.junit = "junit.xml";
};
};
"benchmark" = {
stage = "test";
script = [
"nix run .#bench"
];
};
"docs" = {
stage = "build";
script = [
# sh
''
nix build .#docs:default
mkdir -p public
cp -r result/. public/
''
];
artifacts.paths = ["public"];
};
"pages" = {
nix.enable = false;
image = "alpine:latest";
stage = "deploy";
script = ["true"];
artifacts.paths = ["public"];
rules = [
{
"if" = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH";
}
];
};
};
};
}

View file

@ -1,18 +1,24 @@
{inputs, ...}: let {
inherit (inputs) pkgs devshell treefmt; inputs,
cell,
...
}: let
inherit (inputs) pkgs devshell treefmt soonix;
inherit (cell) ci;
in { in {
default = devshell.mkShell { default = devshell.mkShell {
imports = [soonix.devshellModule];
packages = [ packages = [
pkgs.nil pkgs.nil
(treefmt.mkWrapper pkgs { (treefmt.mkWrapper pkgs {
programs = { programs = {
alejandra.enable = true; alejandra.enable = true;
statix.enable = true;
deadnix.enable = true; deadnix.enable = true;
mdformat.enable = true; mdformat.enable = true;
}; };
}) })
]; ];
soonix.hooks.ci = ci.soonix;
meta = { meta = {
enableMenu = true; enableMenu = true;
showMenu = "always"; showMenu = "always";

37
nix/repo/flake.lock generated
View file

@ -1,5 +1,23 @@
{ {
"nodes": { "nodes": {
"nix-gitlab-ci-lib": {
"locked": {
"dir": "lib",
"lastModified": 1756974596,
"narHash": "sha256-KxQj76sUqvPNtrqzNWMZeOWqTitc0aFCYj7UZzToiEA=",
"owner": "TECHNOFAB",
"repo": "nix-gitlab-ci",
"rev": "00cf5b83c6c46698fba12a54b9cc15c6d4e5a4dd",
"type": "gitlab"
},
"original": {
"dir": "lib",
"owner": "TECHNOFAB",
"ref": "3.0.0-alpha.2",
"repo": "nix-gitlab-ci",
"type": "gitlab"
}
},
"nixmkdocs": { "nixmkdocs": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
@ -36,11 +54,30 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nix-gitlab-ci-lib": "nix-gitlab-ci-lib",
"nixmkdocs": "nixmkdocs", "nixmkdocs": "nixmkdocs",
"nixtest-lib": "nixtest-lib", "nixtest-lib": "nixtest-lib",
"soonix-lib": "soonix-lib",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }
}, },
"soonix-lib": {
"locked": {
"dir": "lib",
"lastModified": 1757424411,
"narHash": "sha256-x99obZwqDAhUB+VUhAV9sKH00NnsVi481n/8bdvZCUY=",
"owner": "TECHNOFAB",
"repo": "soonix",
"rev": "add807ef8980197bbd06652a36d937b93b2a31c7",
"type": "gitlab"
},
"original": {
"dir": "lib",
"owner": "TECHNOFAB",
"repo": "soonix",
"type": "gitlab"
}
},
"treefmt-nix": { "treefmt-nix": {
"flake": false, "flake": false,
"locked": { "locked": {

View file

@ -2,6 +2,8 @@
inputs = { inputs = {
nixtest-lib.url = "gitlab:TECHNOFAB/nixtest?dir=lib"; nixtest-lib.url = "gitlab:TECHNOFAB/nixtest?dir=lib";
nixmkdocs.url = "gitlab:TECHNOFAB/nixmkdocs?dir=lib"; nixmkdocs.url = "gitlab:TECHNOFAB/nixmkdocs?dir=lib";
soonix-lib.url = "gitlab:TECHNOFAB/soonix?dir=lib";
nix-gitlab-ci-lib.url = "gitlab:TECHNOFAB/nix-gitlab-ci/3.0.0-alpha.2?dir=lib";
treefmt-nix = { treefmt-nix = {
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";
flake = false; flake = false;
@ -12,6 +14,8 @@
// { // {
ntlib = i.nixtest-lib.lib {inherit (i.parent) pkgs;}; ntlib = i.nixtest-lib.lib {inherit (i.parent) pkgs;};
doclib = i.nixmkdocs.lib {inherit (i.parent) pkgs;}; doclib = i.nixmkdocs.lib {inherit (i.parent) pkgs;};
soonix = i.soonix-lib.lib {inherit (i.parent) pkgs;};
cilib = i.nix-gitlab-ci-lib.lib {inherit (i.parent) pkgs;};
devshell = import "${i.parent.self}/lib" {inherit (i.parent) pkgs;}; devshell = import "${i.parent.self}/lib" {inherit (i.parent) pkgs;};
treefmt = import i.treefmt-nix; treefmt = import i.treefmt-nix;
}; };