From 977568c78a95c17fbc13f6feb0168f1c2d7ae3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20L=C3=B6tscher?= Date: Sun, 11 Oct 2026 12:56:28 +0200 Subject: [PATCH] Add Lua 5.5 support --- .github/workflows/ci.yml | 15 ++++++++------- README.md | 10 +++++----- lua-vips-1.1-12.rockspec | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 321d2cb..8478d8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,15 +7,15 @@ jobs: strategy: fail-fast: false matrix: - luaVersion: ["5.1", "5.2", "5.3", "5.4", "luajit-openresty"] + luaVersion: ["5.1", "5.2", "5.3", "5.4", "5.5", "luajit-openresty"] os: ["ubuntu-latest", "macos-latest"] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - uses: leafo/gh-actions-lua@v12 + - uses: leafo/gh-actions-lua@v13 with: luaVersion: ${{ matrix.luaVersion }} @@ -42,7 +42,7 @@ jobs: - name: Lint with luacheck run: | - luarocks install luacheck + luarocks install luacheck --dev luacheck -q . - name: Busted tests @@ -56,7 +56,8 @@ jobs: # Two tests are failing #- lua: { version: "5.1", msys2-name: "lua51", exe: "lua5.1" } - lua: { version: "5.3", msys2-name: "lua53", exe: "lua5.3" } - - lua: { version: "5.4", msys2-name: "lua", exe: "lua" } + - lua: { version: "5.4", msys2-name: "lua54", exe: "lua5.4" } + - lua: { version: "5.5", msys2-name: "lua", exe: "lua" } - lua: { version: "5.1", msys2-name: "luajit", exe: "luajit" } runs-on: windows-latest @@ -65,7 +66,7 @@ jobs: shell: msys2 {0} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - uses: msys2/setup-msys2@v2 with: @@ -106,7 +107,7 @@ jobs: - name: Lint with luacheck run: | - luarocks install luacheck + luarocks install luacheck --dev luacheck.bat -q . - name: Busted tests diff --git a/README.md b/README.md index 7710751..6bef07b 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ library](http://libvips.github.io/libvips). `libvips` is a [fast image processing library with low memory needs](https://github.com/jcupitt/lua-vips-bench). `lua-vips` uses ffi and needs either - luajit >= 2.0 or -- standard Lua (5.1 up to 5.4) combined with the [`luaffi-tkl`](https://luarocks.org/modules/sudheerhebbale/luaffi-tkl) Lua package. +- standard Lua (5.1 up to 5.5) combined with the [`luaffi-tkl`](https://luarocks.org/modules/sudheerhebbale/luaffi-tkl) Lua package. On the x64 architecture `lua-vips` is continuously tested -- on Linux and MacOS with Lua 5.1, 5.2, 5.3, 5.4 and openresty-luajit -- on Windows using [MSYS2 MinGW-w64](https://www.msys2.org/) with Lua 5.3, 5.4 and luajit +- on Linux and MacOS with Lua 5.1, 5.2, 5.3, 5.4, 5.5 and openresty-luajit +- on Windows using [MSYS2 MinGW-w64](https://www.msys2.org/) with Lua 5.3, 5.4, 5.5 and luajit `lua-vips` should work on arm64 (recently tested on a Pinephone Pro using PostmarketOS) and possibly x86 (currently untested) as well. @@ -695,7 +695,7 @@ Installing `lua-vips` on Windows is a bit harder than on Unix systems. We recomm ```shell pacman -Syuu ``` -4. Install the build tools (including Lua 5.4 and Luarocks) via +4. Install the build tools (including Lua 5.5 and Luarocks) via ```shell pacman -S git make mingw-w64-x86_64-toolchain mingw-w64-x86_64-lua-luarocks ``` @@ -709,7 +709,7 @@ Installing `lua-vips` on Windows is a bit harder than on Unix systems. We recomm mingw-w64-x86_64-imagemagick mingw-w64-x86_64-poppler ``` -6. Optionally: If you want to use `lua-vips` with LuaJIT instead of Lua 5.4 install LuaJIT via +6. Optionally: If you want to use `lua-vips` with LuaJIT instead of Lua 5.5 install LuaJIT via ```shell pacman -S mingw-w64-x86_64-luajit luarocks config --scope system lua_version 5.1 diff --git a/lua-vips-1.1-12.rockspec b/lua-vips-1.1-12.rockspec index 4cdc8ca..1a725f8 100644 --- a/lua-vips-1.1-12.rockspec +++ b/lua-vips-1.1-12.rockspec @@ -22,7 +22,7 @@ description = { } dependencies = { - "lua >= 5.1, < 5.5", -- standard Lua or LuaJIT >= 2.0 + "lua >= 5.1, < 5.6", -- standard Lua or LuaJIT >= 2.0 "luaffi-tkl >= 1.0" -- provided by VM with LuaJIT, use `luarocks config rocks_provided.luaffi-tkl 2.1-1` in that case }