Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -42,7 +42,7 @@ jobs:

- name: Lint with luacheck
run: |
luarocks install luacheck
luarocks install luacheck --dev
luacheck -q .

- name: Busted tests
Expand All @@ -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
Expand All @@ -65,7 +66,7 @@ jobs:
shell: msys2 {0}

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- uses: msys2/setup-msys2@v2
with:
Expand Down Expand Up @@ -106,7 +107,7 @@ jobs:

- name: Lint with luacheck
run: |
luarocks install luacheck
luarocks install luacheck --dev
luacheck.bat -q .

- name: Busted tests
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
```
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lua-vips-1.1-12.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading