ci

.github/workflows/ci.yml

@@ -0,0 +1,79 @@
+on: [ push, pull_request ]
+
+name: CI
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - uses: icewind1991/attic-action@v1
+        with:
+          name: ci
+          instance: https://cache.icewind.me
+          authToken: '${{ secrets.ATTIC_TOKEN }}'
+      - run: nix build .#check
+
+
+  check-extractor:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - uses: icewind1991/attic-action@v1
+        with:
+          name: ci
+          instance: https://cache.icewind.me
+          authToken: '${{ secrets.ATTIC_TOKEN }}'
+      - run: nix build .#extractor
+
+  clippy:
+    runs-on: ubuntu-latest
+    needs: check
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - uses: icewind1991/attic-action@v1
+        with:
+          name: ci
+          instance: https://cache.icewind.me
+          authToken: '${{ secrets.ATTIC_TOKEN }}'
+      - run: nix build .#clippy
+
+  build:
+    runs-on: ubuntu-latest
+    needs: check
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - x86_64-unknown-linux-gnu
+          - x86_64-unknown-linux-musl
+          - x86_64-pc-windows-gnu
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - uses: icewind1991/attic-action@v1
+        with:
+          name: ci
+          instance: https://cache.icewind.me
+          authToken: '${{ secrets.ATTIC_TOKEN }}'
+      - run: nix build .#${{ matrix.target }}
+      - uses: actions/upload-artifact@v4
+        with:
+          name: logsmash-${{ matrix.target }}
+          path: result/bin/*
+
+  build-nixpkgs:
+    runs-on: ubuntu-latest
+    needs: check
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - uses: icewind1991/attic-action@v1
+        with:
+          name: ci
+          instance: https://cache.icewind.me
+          authToken: '${{ secrets.ATTIC_TOKEN }}'
+      - run: nix build .#logsmash

flake.nix

@@ -65,7 +65,7 @@
         ];
         releaseTargets = lib.lists.remove hostTarget targets;
 
-        src = sourceByRegex ./. ["Cargo.*" "(src)(/.*)?"];
+        src = sourceByRegex ./. ["Cargo.*" "(src|data)(/.*)?"];
         extractorSrc = sourceByRegex ./logging-extractor ["Cargo.*" "(src)(/.*)?"];
         nearskOpt = {
           pname = "cloud-log-analyser";
@@ -76,30 +76,20 @@
           lib.attrsets.genAttrs targets (target:
             (cross-naersk'.buildPackage target) nearskOpt)
           // {
-            inherit (pkgs) logging-extractor extracted-logs extracted-logs-rust;
+            inherit (pkgs) logging-extractor extracted-logs extracted-logs-rust logsmash;
-            check = naersk'.buildPackage (nearskOpt
+            check = msrvNaersk.buildPackage (nearskOpt
               // {
                 mode = "check";
               });
-            extractorCheck = naersk'.buildPackage (nearskOpt
+            extractor = msrvNaersk.buildPackage (nearskOpt
               // {
-                mode = "check";
                 root = extractorSrc;
               });
-            clippy = naersk'.buildPackage (nearskOpt
+            clippy = msrvNaersk.buildPackage (nearskOpt
               // {
                 mode = "clippy";
               });
-            msrv = msrvNaersk.buildPackage (nearskOpt
+            default = pkgs.logsmash;
-              // {
-                mode = "check";
-              });
-            extractorMsrv = extractorMsrvNaersk.buildPackage (nearskOpt
-              // {
-                mode = "check";
-                root = extractorSrc;
-              });
-            default = pkgs.shelve;
           };
         apps.default = packages.default;
 

nix/overlay.nix

@@ -26,4 +26,5 @@ in {
     name = "extracted-logs";
     paths = flatten (map attrValues (attrValues final.extracted-logs-parts-rust));
   };
+  logsmash = final.callPackage ./package.nix {};
 }

nix/package.nix

@@ -0,0 +1,23 @@
+{
+  stdenv,
+  makeRustPlatform,
+  rust-bin,
+  lib,
+}: let
+  inherit (lib.sources) sourceByRegex;
+  src = sourceByRegex ../. ["Cargo.*" "(src|data)(/.*)?"];
+  rustPlatform = makeRustPlatform {
+    cargo = rust-bin.stable.latest.default;
+    rustc = rust-bin.stable.latest.default;
+  };
+in
+  rustPlatform.buildRustPackage rec {
+    pname = "logsmash";
+    version = "0.1.0";
+
+    inherit src;
+
+    cargoLock = {
+      lockFile = ../Cargo.lock;
+    };
+  }