From 653fdf5ffa999e4a39545dd6fc9272852d26e4d9 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Wed, 20 Nov 2024 13:19:45 +0300
Subject: [PATCH] ci(tooling): Add instead of remove test-specific tooling

---
 .cirrus.yml                    | 2 +-
 .github/workflows/build.yml    | 5 +++--
 .github/workflows/coverage.yml | 3 ++-
 .github/workflows/deploy.yml   | 3 ++-
 .github/workflows/test.yml     | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index ca69c9455..7c97d3e0c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -43,7 +43,7 @@ task:
   configure_script: |
     ./configure MAKE=gmake \
       --enable-developer-mode \
-      BUSTED=false CARGOSETVERSION=false DELTA=cat DOCKER=false LDOC=false LUACHECK=false LUAROCKS=false NIX=false NPM=false PDFINFO=false STYLUA=false TAPLO=false TYPOS=false \
+      --without-developer-tools \
       --disable-font-variations \
       --with-system-lua-sources \
       --with-system-luarocks \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 771e38551..542ac9f40 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
           ./bootstrap.sh
           ./configure \
             --enable-developer-mode \
-            BUSTED=false CARGOSETVERSION=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TAPLO=false TYPOS=cat \
+            --without-developer-tools \
             --disable-font-variations \
             --with-manual \
             ${{ matrix.configuration[1] }}
@@ -114,7 +114,8 @@ jobs:
           ./bootstrap.sh
           ./configure \
             --enable-developer-mode \
-            BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat FCMATCH=true PDFINFO=false CARGO=true \
+            --without-developer-tools \
+              DOCKER=$(which docker) \
             --disable-font-variations \
             --with-system-lua-sources \
             --without-manual
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 736ad236b..850465f01 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -61,7 +61,8 @@ jobs:
           ./bootstrap.sh
           ./configure \
             --enable-developer-mode \
-            CARGOSETVERSION=false DELTA=cat LDOC=false LUACHECK=false NIX=false STYLUA=false TAPLO=false TYPOS=false \
+            --without-developer-tools
+              BUSTED=$(which busted) \
             --disable-font-variations \
             --without-manual
       - name: Make
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 576ae7d73..e1b8ff81a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -31,7 +31,8 @@ jobs:
           ./bootstrap.sh
           ./configure \
             --enable-developer-mode \
-            BSDTAR=false BUSTED=false CARGOSETVERSION=false DELTA=false FCMATCH=true LDOC=false LUACHECK=false LUAROCKS=false NIX=false PDFINFO=false STYLUA=false TAPLO=false TYPOS=false \
+            --without-developer-tools \
+              DOCKER=$(which docker) \
             --without-harfbuzz \
             --disable-font-variations
       - name: Publish Docker Image to GH Container Registry
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cc4b8f507..c1b341294 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -72,7 +72,8 @@ jobs:
           ./configure \
             ${{ matrix.luaVersion[1] }} \
             --enable-developer-mode \
-            CARGOSETVERSION=false LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TAPLO=false TYPOS=false \
+            --without-developer-tools \
+              BUSTED=$(which busted) \
             --disable-font-variations \
             --with${{ !startsWith(matrix.luaVersion[0], 'luajit') && 'out' || '' }}-luajit \
             --without-system-luarocks \