Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump luarocks from 3.9.2 to 3.10.0 #12662

Merged
merged 1 commit into from
Mar 5, 2024
Merged

chore(deps): bump luarocks from 3.9.2 to 3.10.0 #12662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .requirements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
KONG_PACKAGE_NAME=kong

OPENRESTY=1.25.3.1
LUAROCKS=3.9.2
LUAROCKS=3.10.0
OPENSSL=3.2.1
PCRE=10.43
LIBEXPAT=2.5.0
Expand Down
2 changes: 1 addition & 1 deletion build/luarocks/luarocks_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def luarocks_repositories():
name = "luarocks",
build_file = "//build/luarocks:BUILD.luarocks.bazel",
strip_prefix = "luarocks-" + version,
sha256 = "bca6e4ecc02c203e070acdb5f586045d45c078896f6236eb46aa33ccd9b94edb",
sha256 = "e9bf06d5ec6b8ecc6dbd1530d2d77bdb3377d814a197c46388e9f148548c1c89",
urls = [
"https://luarocks.org/releases/luarocks-" + version + ".tar.gz",
],
Expand Down
2 changes: 1 addition & 1 deletion build/luarocks/luarocks_wrap_script.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ if install_dest:sub(-1) ~= "/" then
install_dest = install_dest .. "/"
end
-- HACK
cfg.lua_interpreter = "luajit"
cfg.sysconfdir = install_dest .. "etc/luarocks"
cfg.variables["LUA"] = install_dest .. "openresty/luajit/bin/luajit"
cfg.variables["LUA_DIR"] = install_dest .. "openresty/luajit"
cfg.variables["LUA_INCDIR"] = install_dest .. "openresty/luajit/include/luajit-2.1"
cfg.variables["LUA_BINDIR"] = install_dest .. "openresty/luajit/bin"
Expand Down
2 changes: 1 addition & 1 deletion build/templates/venv-commons
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $KONG_VENV/openresty/site/lualib/?.lua;$KONG_VENV/openresty/site/lualib/?.ljbc;\
$KONG_VENV/openresty/site/lualib/?/init.lua;$KONG_VENV/openresty/site/lualib/?/init.ljbc;\
$KONG_VENV/openresty/lualib/?.lua;$KONG_VENV/openresty/lualib/?.ljbc;\
$KONG_VENV/openresty/lualib/?/init.lua;$KONG_VENV/openresty/lualib/?/init.ljbc;\
$KONG_VENV/openresty/luajit/share/luajit-2.1.0-beta3/?.lua"
$KONG_VENV/openresty/luajit/share/luajit-2.1/?.lua"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was curious about this change, so I went to inspect my local build. I can see that I actually have both directories in kong master:

$ ls bazel-kong/bazel-out/k8-fastbuild/bin/external/openresty/luajit/share/
drwxr-xr-x. michaelm michaelm 4.0 KB Wed Oct 18 13:43:19 2023  lua
drwxr-xr-x. michaelm michaelm 4.0 KB Thu Jan 18 11:06:14 2024  luajit-2.1
drwxr-xr-x. michaelm michaelm 4.0 KB Wed Oct 18 13:43:19 2023  luajit-2.1.0-beta3
drwxr-xr-x. michaelm michaelm 4.0 KB Wed Oct 18 13:43:19 2023  man

Can you explain more of the context? Is this just a fix for an older path that we forgot to update?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@flrgh The LuaJIT moved to so called 2.1.ROLLING and -beta3 is more or less gone. Your -beta3 is created on 2023. so perhaps it is a leftover.


# support custom plugin development
if [ -n $KONG_PLUGIN_PATH ] ; then
Expand Down
2 changes: 2 additions & 0 deletions changelog/unreleased/kong/bump-luarocks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
message: "Bumped LuaRocks from 3.9.2 to 3.10.0"
type: dependency
Loading