ci(tooling): Use addative instead of subtractive test tooling configs

sile-typesetter · Nov 20, 2024 · d52ceb0 · d52ceb0
1 parent 231fa02
commit d52ceb0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -41,9 +41,12 @@ task:
     - git fetch --prune --tags ||:
     - ./bootstrap.sh
   configure_script: |
-    ./configure MAKE=gmake \
+    ./configure \
+        DOCKER=false \
+        MAKE=gmake \
+        PDFINFO=false \
       --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
@@ -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] }}
@@ -113,8 +113,11 @@ jobs:
         run: |
           ./bootstrap.sh
           ./configure \
+              FCMATCH=true \
+              PDFINFO=false \
             --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
@@ -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
@@ -30,8 +30,12 @@ jobs:
           echo "REF=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV
           ./bootstrap.sh
           ./configure \
+              BSDTAR=false \
+              FCMATCH=true \
+              PDFINFO=false \
             --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
@@ -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 \

diff --git a/Makefile.am b/Makefile.am
@@ -211,7 +211,7 @@ sile-$(VERSION).pdf: $(MANUAL)
 sile-%.md: CHANGELOG.md
 	$(SED) -e '/\.\.\.v$*/,/\.\.\.v/!d' CHANGELOG.md | \
 		$(SED) -e '1,3d;N;$$!P;$$!D;$$d' |
-	$(or $(filter cat,$(TYPOS)),$(TYPOS) --write-changes -) > $@
+	$(if $(TYPOS),$(TYPOS) --write-changes,cat) - > $@
 
 check: selfcheck
 

diff --git a/build-aux/que_font.m4 b/build-aux/que_font.m4
@@ -3,7 +3,7 @@ AC_DEFUN([QUE_FONT], [
         if test -z "$FCMATCH"; then
                 AC_PATH_PROG(FCMATCH, fc-match)
                 if test -z "$FCMATCH"; then
-                AC_MSG_ERROR([can't find fc-match])
+                        AC_MSG_ERROR([can't find fc-match])
                 fi
         fi
         pushdef([FONT],$1)

diff --git a/configure.ac b/configure.ac
@@ -236,7 +236,6 @@ AM_COND_IF([SYSTEM_LUAROCKS], [
 
 QUE_FONT(Gentium Plus)
 
-
 AC_SUBST([APPKIT_TRUE])
 AC_SUBST([FONTCONFIG_TRUE])
 AC_SUBST([FONT_VARIATIONS_TRUE])