Merge branch 'master' into feat-operator-table

sile-typesetter · Nov 23, 2024 · 16dfe21 · 16dfe21
2 parents 84eaa67 + 6bc618c
commit 16dfe21
Show file tree

Hide file tree

Showing 46 changed files with 1,213 additions and 421 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -41,11 +41,16 @@ task:
     - git fetch --prune --tags ||:
     - ./bootstrap.sh
   configure_script: |
-    ./configure MAKE=gmake \
-      --enable-developer-mode LDOC=false LUAROCKS=false LUACHECK=false BUSTED=false DELTA=cat PDFINFO=false NIX=false NPM=false DOCKER=false STYLUA=false TYPOS=false \
+    ./configure \
+        DOCKER=false \
+        MAKE=gmake \
+        PDFINFO=false \
+      --enable-developer-mode \
+      --without-developer-tools \
       --disable-font-variations \
       --with-system-lua-sources \
       --with-system-luarocks \
+      --with-luarocks=luarocks51 \
       --without-manual
   make_script:
     - gmake all

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 DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=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
@@ -144,7 +147,7 @@ jobs:
             .sources
           key: fonts-${{ hashFiles('Makefile-fonts') }}
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v15
+        uses: DeterminateSystems/nix-installer-action@v16
       - name: Cache Nix dependencies
         uses: DeterminateSystems/magic-nix-cache-action@v8
       - name: Setup developer environment

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -60,7 +60,9 @@ jobs:
         run: |
           ./bootstrap.sh
           ./configure \
-            --enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \
+            --enable-developer-mode \
+            --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,20 +30,14 @@ jobs:
           echo "REF=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV
           ./bootstrap.sh
           ./configure \
+              BSDTAR=false \
+              FCMATCH=true \
+              PDFINFO=false \
             --enable-developer-mode \
+            --without-developer-tools \
+              DOCKER=$(which docker) \
             --without-harfbuzz \
-            --disable-font-variations \
-            BSDTAR=false \
-            BUSTED=false \
-            DELTA=false \
-            FCMATCH=true \
-            LDOC=false \
-            LUACHECK=false \
-            LUAROCKS=false \
-            NIX=false \
-            PDFINFO=false \
-            STYLUA=false \
-            TYPOS=false
+            --disable-font-variations
       - name: Publish Docker Image to GH Container Registry
         run: |
           make docker-build-push

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v15
+        uses: DeterminateSystems/nix-installer-action@v16
       - name: Cache Nix dependencies
         uses: DeterminateSystems/magic-nix-cache-action@v8
       # Upstream package sometimes has flags set that disable flake checking

diff --git a/.github/workflows/stylua.yml b/.github/workflows/stylua.yml
@@ -1,6 +1,6 @@
 name: StyLua
 
-on: [ workflow_dispatch ]
+on: [ push, pull_request ]
 
 jobs:
 
@@ -9,8 +9,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: JohnnyMorganz/stylua-action@v4
+      - name: StyLua
+        uses: JohnnyMorganz/stylua-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          version: latest
+          version: 2.0.0
           args: --check --respect-ignores -g '*.lua' -g '*.lua.in' -g '*.rockspec.in' .busted .luacov .luacheckrc build-aux/config.ld .
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -71,7 +71,9 @@ jobs:
           ./bootstrap.sh
           ./configure \
             ${{ matrix.luaVersion[1] }} \
-            --enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \
+            --enable-developer-mode \
+            --without-developer-tools \
+              BUSTED=$(which busted) \
             --disable-font-variations \
             --with${{ !startsWith(matrix.luaVersion[0], 'luajit') && 'out' || '' }}-luajit \
             --without-system-luarocks \

diff --git a/Cargo.lock b/Cargo.lock