Merge 49ef9d7 into d0a2a1e

.github/workflows/rust_lint.yml

@@ -20,7 +20,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
       - name: Run rustfmt
         run: |
-          git ls-files '*.rs' | xargs rustfmt --check
+          git ls-files '*.rs' '*.rs.in' | xargs rustfmt --check --config skip_children=true
 
   clippy:
     strategy:

.github/workflows/test.yml

@@ -13,14 +13,14 @@ jobs:
       fail-fast: false
       matrix:
         luaVersion:
-          - '5.4'
-          - '5.3'
-          - '5.2'
-          - '5.1'
-          - 'luajit'
-          # - 'luajit-openresty'
+          - [ '5.4', 'MYCFLAGS=-fPIC' ]
+          - [ '5.3', 'MYCFLAGS=-fPIC' ]
+          - [ '5.2', 'MYCFLAGS=-fPIC' ]
+          - [ '5.1', 'CFLAGS="-O2 -Wall -DLUA_USE_LINUX -fPIC"' ]
+          - [ 'luajit', 'XCFLAGS=-fPIC' ]
+          # - [ 'luajit-openresty', 'XCFLAGS=-fPIC' ]
     runs-on: ubuntu-22.04
-    name: Test on Lua ${{ matrix.luaVersion }}
+    name: Test on Lua ${{ matrix.luaVersion[0] }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
         with:
           path: |
             lua_modules
-          key: luarocks-${{ matrix.luaVersion }}-${{ hashFiles('Makefile-luarocks', 'sile.rockspec.in') }}
+          key: luarocks-${{ matrix.luaVersion[0] }}-${{ hashFiles('Makefile-luarocks', 'sile.rockspec.in') }}
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2
       - name: Install system dependencies
@@ -48,7 +48,8 @@ jobs:
       - name: Setup ‘lua’
         uses: leafo/gh-actions-lua@v10
         with:
-          luaVersion: ${{ matrix.luaVersion }}
+          luaVersion: ${{ matrix.luaVersion[0] }}
+          luaCompileFlags: ${{ matrix.luaVersion[1] }}
       - name: Setup ‘cargo’
         uses: actions-rs/toolchain@v1
       - name: Setup ‘luarocks’
@@ -71,7 +72,7 @@ jobs:
           ./configure \
             --enable-developer LUACHECK=false NIX=false \
             --disable-font-variations \
-            --with${{ !startsWith(matrix.luaVersion, 'luajit') && 'out' || '' }}-luajit \
+            --with${{ !startsWith(matrix.luaVersion[0], 'luajit') && 'out' || '' }}-luajit \
             --without-manual
       - name: Make
         run: |
@@ -80,7 +81,7 @@ jobs:
         run: |
           make selfcheck
       - name: Test Busted
-        continue-on-error: ${{ matrix.luaVersion == '5.1' }}
+        continue-on-error: ${{ matrix.luaVersion[0] == '5.1' }}
         timeout-minutes: ${{ runner.debug && 20 || 2 }}
         run: |
           make busted
@@ -95,5 +96,5 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: test-${{ matrix.luaVersion }}-actuals
+          name: test-${{ matrix.luaVersion[0] }}-actuals
           path: tests/*.actual

.gitignore

@@ -88,11 +88,14 @@ sile-lua.1
 .tarball-version
 .built-subdirs
 *.so
+*.o
 core/version.lua
 core/features.lua
 target/
 completions/
 core/pathsetup.lua
+src/embed.rs
+src/embed-includes.rs
 
 # Nix symlink to builds
 result