Lua 5.3 + 5.4 integer support, with CI and conflicts fixed

hishamhm commented 2 years ago

Hello @leafo, @agentzh and @cloudwu!

I just took #3 which has been open since 2015(!) and got it to a mergeable state, by reconciling the changes made in https://github.com/openresty/lua-cjson and https://github.com/cloudwu/lua-cjson. I also added Lua 5.4 to the test matrix added by @leafo in #50.

I have made an explicit merge commit to keep history of both forks, but I can also rebase the cloudwu branch onto this repo if preferred. I'd just like this to get merged and the lua-cjson Lua version compatibility nightmare to be over after so many years. :)

I also noticed that version 2.1.0.10 was tagged in this repo but it was never uploaded to LuaRocks: https://luarocks.org/modules/openresty/lua-cjson

Ideally, we should merge this, tag 2.1.0.11 and upload it to LuaRocks (I can either add a commit with the version bump, or make a separate PR).

Thanks!

Closes #3. Fixes #67. Fixes #36.

hishamhm commented 2 years ago

Also, friendly ping to @xiaocang since you tagged 2.1.0.10 :)

leafo commented 2 years ago

Just a heads up: I pushed 2.1.0.10 and 2.1.0.9 to luarocks.org today, which should allow it to install on Lua 5.2+.

hishamhm commented 5 months ago

@leafo I rebased the original version of this PR into latest master, and I got the Github Actions workflow to run green (at least on my fork; it does not show up here).

So this branch now contains a bunch of unrelated / semi-related things:

Lua 5.3+ integer support, from @cloudwu + tweaks and fixes, including those of mine
adjustments to get the Github Actions CI runnable and green (it's not activated in this repo though? it seems to have both Travis and Actions files, but only Travis is running here)
vendored dtoa.c version bump from upstream (which I did while fixing cppcheck warnings from CI)
various other minor upstream commits, from original lua-cjson author @mpx as well as from @cloudwu's fork
rockspec fix and bump, readying it for a new release 2.1.0.14.

I can split these into multiple PRs if necessary for review but I think the Actions CI will only run green with all of them.

@Tieske has pinged me asking whether we can get a new release pushed to luarocks.org because of the security fix in 2.1.0.13 (which has the security fix but a broken rockspec). The latest version in luarocks.org is 2.1.0.10.

Could we get this PR reviewed/merged and a new release out? Or at the very least push 2.1.0.13 to luarocks.org with a fixed rockspec.

openresty / lua-cjson

Lua 5.3 + 5.4 integer support, with CI and conflicts fixed #84