From afffe8e6d70172b9d53648169bdaf68305ca0a6e Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Thu, 24 Mar 2022 02:11:14 -0700 Subject: [PATCH 1/2] Add `luarocks test` support I think this might drop support for Luarocks earlier than 3.0, but not totally sure. Closes #592 --- luv-scm-0.rockspec | 6 ++++++ rockspecs/luv-scm-0.rockspec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/luv-scm-0.rockspec b/luv-scm-0.rockspec index 1a5bca2c..1e26d8cc 100644 --- a/luv-scm-0.rockspec +++ b/luv-scm-0.rockspec @@ -3,6 +3,7 @@ version = "scm-0" source = { url = 'git://github.com/luvit/luv.git' } +rockspec_format = "3.0" description = { summary = "Bare libuv bindings for lua", @@ -33,3 +34,8 @@ build = { LUADIR="$(LUADIR)", }, } + +test = { + type = "command", + script = "tests/run.lua", +} diff --git a/rockspecs/luv-scm-0.rockspec b/rockspecs/luv-scm-0.rockspec index be743f9d..dcf612a0 100644 --- a/rockspecs/luv-scm-0.rockspec +++ b/rockspecs/luv-scm-0.rockspec @@ -4,6 +4,7 @@ version = "scm-0" source = { url = 'git://github.com/luvit/luv.git' } +rockspec_format = "3.0" description = { summary = "Bare libuv bindings for lua", @@ -84,3 +85,8 @@ build = { }; } } + +test = { + type = "command", + script = "tests/run.lua", +} From a841d2fe910282c2e883379c7cdb58e6c69b2816 Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Wed, 30 Mar 2022 01:55:14 -0700 Subject: [PATCH 2/2] Drop Luarocks 2.x support --- .github/workflows/ci.yml | 6 +----- appveyor.yml | 11 ----------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0aca95c8..7153212c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,17 +84,13 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest] - luarocks_version: [2.4.4, 3.8.0] + luarocks_version: [3.8.0] lua_engine: [Lua, LuaJIT] include: - lua_engine: LuaJIT lua_version: luajit2.1 - lua_engine: Lua lua_version: lua5.4 - # use 5.3 with Luarocks 2.x - - luarocks_version: 2.4.4 - lua_engine: Lua - lua_version: lua5.3 env: # For LuaJIT 2.1, see https://github.com/LuaJIT/LuaJIT/commit/8961a92dd1607108760694af3486b4434602f8be MACOSX_DEPLOYMENT_TARGET: 10.12 diff --git a/appveyor.yml b/appveyor.yml index 441f0eb6..e3f141a3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,26 +17,15 @@ environment: - LJ_VER: 2.1 LUAROCKS_VER: 3.8.0 - # LuaRocks 2.x - - LUA_VER: 5.3.6 - NOCOMPAT: true # with compatibility flags disabled. - LUAROCKS_VER: 2.4.4 - - LJ_VER: 2.1 - LUAROCKS_VER: 2.4.4 - matrix: fast_finish: true exclude: # Skip x86 for LuaRocks tests - platform: x86 LUAROCKS_VER: 3.8.0 - - platform: x86 - LUAROCKS_VER: 2.4.4 # Only test LuaRocks with latest MSVC - image: Visual Studio 2015 LUAROCKS_VER: 3.8.0 - - image: Visual Studio 2015 - LUAROCKS_VER: 2.4.4 cache: - c:\lua -> appveyor.yml