From fa9b35a0cf11bc856cbd8bffbef5ad6fb3e62a93 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Mon, 31 Aug 2026 18:21:20 +0300 Subject: Add Lua 5.5 support (#473) --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 1 + docs/index.html | 2 +- makefile | 8 +++++++- src/makefile | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22ce0c6..96564fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ] + luaVersion: [ "5.5", "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ] platform: [ "ubuntu-22.04", "macos-14", "windows-2022" ] runs-on: ${{ matrix.platform }} steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index a287d8b..8706705 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ * Pass correct path length for abstract Unix sockets – @Zash * Return immediately, not block, when asked to receive 0 – @Tieske * Properly format IPv6 addresses with brackets in host header – @Tieske +* Document support for Lua 5.5 (no code changes) – @alerque ## [v3.1.0](https://github.com/lunarmodules/luasocket/releases/v3.1.0) — 2022-07-27 diff --git a/docs/index.html b/docs/index.html index ad92687..3341f8d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -88,7 +88,7 @@ Author: Diego Nehab

LuaSocket version 3.1.0 is now available for download! -It is compatible with Lua 5.1 through 5.4. +It is compatible with Lua 5.1 through 5.5. Chances are it works well on most UNIX distributions and Windows flavors.

diff --git a/makefile b/makefile index 227ad70..f7a5859 100644 --- a/makefile +++ b/makefile @@ -5,7 +5,7 @@ # Targets: # install install system independent support # install-unix also install unix-only support -# install-both install for lua51 lua52 lua53 +# install-both install for lua51 lua52 lua53 lua54 lua55 # install-both-unix also install unix-only # print print the build settings @@ -36,6 +36,9 @@ install-both: $(MAKE) clean @cd src; $(MAKE) $(PLAT) LUAV=5.4 @cd src; $(MAKE) install LUAV=5.4 + $(MAKE) clean + @cd src; $(MAKE) $(PLAT) LUAV=5.5 + @cd src; $(MAKE) install LUAV=5.5 install-both-unix: $(MAKE) clean @@ -50,6 +53,9 @@ install-both-unix: $(MAKE) clean @cd src; $(MAKE) $(PLAT) LUAV=5.4 @cd src; $(MAKE) install-unix LUAV=5.4 + $(MAKE) clean + @cd src; $(MAKE) $(PLAT) LUAV=5.5 + @cd src; $(MAKE) install-unix LUAV=5.5 .PHONY: test diff --git a/src/makefile b/src/makefile index 868f98c..310fe4e 100644 --- a/src/makefile +++ b/src/makefile @@ -16,7 +16,7 @@ # platform to build for PLAT?=linux -# LUAV: 5.1 5.2 5.3 5.4 +# LUAV: 5.1 5.2 5.3 5.4 5.5 # lua version to build against LUAV?=5.1 @@ -234,7 +234,7 @@ O_ucrt64=o CC_ucrt64=gcc DEF_ucrt64= -DLUASOCKET_$(DEBUG) \ -DWINVER=0x0501 -CFLAGS_ucrt64= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common +CFLAGS_ucrt64= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common # \ -fvisibility=hidden LDFLAGS_ucrt64= $(LUALIB) -shared -Wl,-s -lws2_32 -o -- cgit v1.2.3-55-g6feb