From 967fe00c6375ffe8679d83b3f6a21ba62f199ef3 Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Wed, 19 Oct 2022 21:12:29 -0400
Subject: [PATCH] Consolidate steps

---
 .drone.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 54b028f..ec749aa 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,21 +7,17 @@ environment:
   CACHE_NAME: mat
 
 steps:
-  - name: set up cachix
-    image: nixos/nix
-    environment:
-      CACHIX_AUTH_TOKEN:
-        from_secret: cachix_auth_token
-    commands:
-      - $NIX profile install nixpkgs#cachix
-      - cachix use $CACHE_NAME
   - name: nix build
     image: nixos/nix
     volumes:
       - name: site
         path: /site
+    environment:
+      CACHIX_AUTH_TOKEN:
+        from_secret: cachix_auth_token
     commands:
-      - $NIX profile install nixpkgs#jq
+      - $NIX profile install nixpkgs#cachix nixpkgs#jq
+      - cachix use $CACHE_NAME
       - >
         $NIX flake archive --json \
         | jq -r '.path,(.inputs|to_entries[].value.path)' \