From 0ff35842087b3b16e7e41caa6f794151b47f304a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 8 Nov 2024 20:47:25 -0500
Subject: Clean up Nix Flake and packaging (#24)

* refactor(nix): split package.nix from flake.nix

* chore(nix): split checks; add more

* ci: run all nix checks

* ci: build in debug mode

* chore(nix): use versionCheckHook

this makes sure the version test is always run, and on the right package

* chore(nix): nix-filter -> lib.fileset

* feat(nix): support stable nix

* ci: fix clippy check
---
 .github/workflows/ci.yaml     | 10 +++++-----
 .github/workflows/clippy.yaml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b2d5df4..0ba71ce 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -41,10 +41,10 @@ jobs:
 
       - name: Run build
         run: |
-          nix build --print-build-logs .#check-version-test
+          nix build --print-build-logs .#nix-forecast-debug
 
-  format:
-    name: Formatting
+  format-and-lint:
+    name: Format and lint
 
     runs-on: ubuntu-latest
 
@@ -60,11 +60,11 @@ jobs:
 
       - name: Run flake checks
         run: |
-          nix build --print-build-logs .#check-formatting
+          nix flake check --print-build-logs --show-trace
 
   release-gate:
     name: CI Release gate
-    needs: [build, format]
+    needs: [build, format-and-lint]
 
     if: ${{ always() }}
 
diff --git a/.github/workflows/clippy.yaml b/.github/workflows/clippy.yaml
index 32668a8..32f2f11 100644
--- a/.github/workflows/clippy.yaml
+++ b/.github/workflows/clippy.yaml
@@ -40,7 +40,7 @@ jobs:
       - name: Run clippy
         id: clippy-run
         run: |
-          nix build --print-build-logs .#check-clippy
+          nix build --print-build-logs .#checks.x86_64-linux.clippy
           [ -L result ] || exit 1
           echo "sarif-file=$(readlink -f result)" >> "$GITHUB_OUTPUT"
 
-- 
cgit v1.2.3