From dfca7fccaa4f67ea9ce85f5142e316d805ef8496 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Sat, 18 Nov 2023 15:59:48 +0000
Subject: [PATCH] CI: Use pre-installed jq

---
 .gitea/workflows/ci.yaml                      |  2 --
 .../boxes/colony/vms/whale2/gitea-actions.nix |  1 +
 secrets/gitea/actions-runner.env.age          | 22 +++++++++----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 129a4a4..c7674a7 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -10,8 +10,6 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - name: Install jq
-        run: apt-get update -y && apt-get install -y jq
       - uses: cachix/install-nix-action@v23
         with:
           # Gitea will supply a token in GITHUB_TOKEN, which this action will
diff --git a/nixos/boxes/colony/vms/whale2/gitea-actions.nix b/nixos/boxes/colony/vms/whale2/gitea-actions.nix
index 6409815..026ea4d 100644
--- a/nixos/boxes/colony/vms/whale2/gitea-actions.nix
+++ b/nixos/boxes/colony/vms/whale2/gitea-actions.nix
@@ -30,6 +30,7 @@ in
           enable = true;
           name = "main-docker";
           labels = [
+            "debian-node-bullseye:docker://node:18-bullseye"
             "ubuntu-22.04:docker://git.nul.ie/dev/actions-ubuntu:22.04"
           ];
           url = "https://git.${pubDomain}";
diff --git a/secrets/gitea/actions-runner.env.age b/secrets/gitea/actions-runner.env.age
index bd9cfcb..c3d9dda 100644
--- a/secrets/gitea/actions-runner.env.age
+++ b/secrets/gitea/actions-runner.env.age
@@ -1,14 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9FSlh2ZyBYL09w
-aWtCSnR1SlF5dGl3ME14cEVXNXRCTlVJc2EzQ2h0aWcrTjZMSlh3CkZVV1p0ekFk
-cGdweS9uOVNKTFZtK2xFRmRYUDU5cjhYeGxsUi90QTJFWUEKLT4gWDI1NTE5IGVP
-TUczWU84V3Znb2UzMnowTkdheDFNYjcwNWNiRENVSnZaL1dnSFV0d1UKT2pwdmJX
-aHF5aGRiT3c2bGtObFZtRTErQzEyYnh0SjliMGRTcXpYbjJDbwotPiBYMjU1MTkg
-azY4Vk5IdEhoVkhuRFdDOWVnV2poQ1JxTlFPSVlmK3lNei81Q3RwL2xoVQp2Tnk0
-dkxObzdSL3pseFBHRzliaDJwZXpiTmtNUFBCcFhCYmVIcjFLSE9ZCi0+IFUsdy1n
-cmVhc2Uga3daakI1IC0yK2IrYiBHdisnRW8KdlNXbmc1Q0hmS3dIVDJGbG9pankx
-L3UyTTBrMHY3emlvd3pEdUFVb0poOEVlWDE4eE5OYmxXSWcwajRsUk9ZZApMeHY5
-NTRlZitnCi0tLSBjczV1M2ppNzVwS1VjeTdjVkt6Zngva3RvUFBhS3FvanVyUHVy
-NkgyZnE4Cj/vbg5W+u2Ycmw31K590IF6tlnrMgn02tFTpGSGBzeay7LrzNWa2MIP
-SoaaCI1YLl0uTR89UuHjuXaLuFCVNuX7wMHpiRlJLBi/FLPiRLA=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9FSlh2ZyBYVENr
+K0ZtTDZGczF0WlpBbEVGMlFNUW15a2RZU0J2N1hTVjhheFVtYjNJCjE3SHdwRWt0
+L3gzZUY1S0w2TEI1cWdRbGNqdGdJdWRZaE1mQXY5ZkdadFEKLT4gWDI1NTE5IGVO
+aVVyY3FXNGpkUXloSTBXNGloKzkyNnJ2MkFzTG0vKytob2lUekozaDQKL3JTV1pO
+TkY2aE0xbTBiai9YRlZSUmNRRFZ0VnRHYnY3S0t5NXpuc2JiawotPiAzPXctZ3Jl
+YXNlIGsqdGFSTiA2RCFKXmFUIH4gYmwra2MKQmRkT01LVnNOMmxWam1CVFJlNnk5
+ZmluTTFrdnFkYTc0TmYzU0YzQllYWUtTMWwxYW50QXJYOCtsa2h5UFA5WQpMdwot
+LS0gaWRMZ0ZnL0RFemZsYUVkaFVVazljeGRWMnAwQWFJZmdEUmhTMHo1aHZjRQqb
+HcpagEpRca6bsYzTmWgB7i7RrVsEaumAJQr8Hr9/UlK7Zt5gNH0pHmSMVOEnBnyX
+QFhjhILPDuO5C1tSROVRTDjSmIHsRpMAkupz6HRF
 -----END AGE ENCRYPTED FILE-----