From b0f018049d91fe032ff485d1556a37f1aa0d85fa Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 30 Dec 2024 02:24:51 +0000
Subject: [PATCH] forgejo-runner-cacher: add jq to the environment

---
 .forgejo/workflows/ci.yaml              | 2 +-
 ops/nixos/lib/forgejo-runner-cacher.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml
index 494a827dfd..7ae614418a 100644
--- a/.forgejo/workflows/ci.yaml
+++ b/.forgejo/workflows/ci.yaml
@@ -38,7 +38,7 @@ jobs:
           pattern: system-paths-*
 
       - run: |
-          jq -s add system-paths/*.json > system-paths.json
+          jq -s add system-paths/*/*.json > system-paths.json
 
       - name: Upload merged
         uses: forgejo/upload-artifact@v4
diff --git a/ops/nixos/lib/forgejo-runner-cacher.nix b/ops/nixos/lib/forgejo-runner-cacher.nix
index 7b77aadb63..d69c7e7f99 100644
--- a/ops/nixos/lib/forgejo-runner-cacher.nix
+++ b/ops/nixos/lib/forgejo-runner-cacher.nix
@@ -47,6 +47,7 @@ in {
             nodejs
             wget
             lix
+            jq
           ];
           settings = {
             runner.capacity = 10;