From 660c2b2c9916d52d662d0b03e651818f7cf1eb3c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 29 Dec 2023 06:38:42 -0500
Subject: ci: use justfile recipies

---
 .github/workflows/ci.yaml     | 25 ++++++-------------------
 .github/workflows/deploy.yaml |  9 ++++++++-
 2 files changed, 14 insertions(+), 20 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f708fa8..2bea9aa 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,6 +8,9 @@ on:
         description: "Auth token for cachix"
   workflow_dispatch:
 
+env:
+  JUST_ARGS: --inputs-from . nixpkgs#just --command
+
 jobs:
   build:
     name: Build outputs
@@ -27,20 +30,11 @@ jobs:
 
       - name: Run build
         run: |
-          args=(
-            --inputs-from .
-            --override-input nixpkgs nixpkgs
-            github:Mic92/nix-fast-build --
-            --no-nom
-            --skip-cached
-            --option accept-flake-config true
-            --flake '.#hydraJobs'
-          )
-
-          nix run "${args[@]}"
+          nix shell ${{ env.JUST_ARGS }} just ci
 
   check:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
 
@@ -61,11 +55,4 @@ jobs:
 
       - name: Run check
         run: |
-          args=(
-            --print-build-logs
-            --show-trace
-            --accept-flake-config
-            --allow-import-from-derivation
-          )
-
-          nix flake check "${args[@]}"
+          nix shell ${{ env.JUST_ARGS }} just check
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 84a376e..388f3ac 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -44,7 +44,14 @@ jobs:
 
       - name: Run deploy
         run: |
-          nix run --inputs-from . nixpkgs#deploy-rs -- -s
+          args=(
+            --inputs-from .
+            nixpkgs#just
+            --command
+            just deploy-all
+          )
+
+          nix shell "${args[@]}"
 
   terranix:
     needs: nixos
-- 
cgit v1.2.3