From e91fc01543053db3ff19f2560715e27478afa48f Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Tue, 21 Jan 2025 18:25:05 +1100
Subject: [PATCH] ci: consolidate check and format

---
 .github/workflows/check.yaml  | 39 +++++++++++++++++++++--------------
 .github/workflows/format.yaml | 34 ------------------------------
 2 files changed, 24 insertions(+), 49 deletions(-)
 delete mode 100644 .github/workflows/format.yaml

diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index b35a02f..6ca7491 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -10,24 +10,33 @@ concurrency:
   group: ooknet-check-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  nix-flake-check:
+  check-format:
+    name: Check Formatting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+      - run: nix run nixpkgs#alejandra -- --check .
+
+  check-dead-code:
+    name: Check Dead Code
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/cachix-action@v15
+        with:
+          name: deadnix
+      - uses: astro/deadnix-action@main
+
+  check-flake:
     name: Check Flake
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # Get access to kunzen
-      - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.9.0
+      - uses: actions/checkout@v4
+      - uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ secrets.KUNZEN_DEPLOY_KEY }}
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - run: nix flake check
 
-      - name: Setup Nix
-        uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Magic Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
-
-      - name: Nix Flake
-        run: nix flake check
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
deleted file mode 100644
index 24f2b44..0000000
--- a/.github/workflows/format.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: "Format Flake"
-on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - .github/**
-      - .gitignore
-jobs:
-  alejandra:
-    name: Format with Alejandra
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Nix
-        uses: DeterminateSystems/nix-installer-action@main
-      - name: Nix Magic Cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Format Flake
-        run: nix run nixpkgs#alejandra -- -c .
-  deadnix:
-    name: Dead Code Analysis with Deadnix
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Nix
-        uses: DeterminateSystems/nix-installer-action@main
-      - name: Setup Deadnix
-        uses: cachix/cachix-action@v15
-        with: 
-          name: deadnix
-      - uses: astro/deadnix-action@main