fix(ci): use PUC-Rio Lua to invoke luarocks

Author: fffonion

build/BUILD.bazel

@@ -55,6 +55,7 @@ kong_rules_group(
         "@brotli",
         "@pcre",
         "@openresty",
+        "@lua",
     ],
     visibility = ["//visibility:public"],
 )
@@ -233,6 +234,12 @@ kong_rules_group(
     visibility = ["//visibility:public"],
 )
 
+kong_install(
+    name = "install-lua",
+    src = "@lua",
+    exclude = ["include"],  # skip install headers
+)
+
 # Wrap up : )
 
 kong_rules_group(
@@ -244,6 +251,7 @@ kong_rules_group(
         ":install-openresty",
         ":install-static-assets",
         ":install-tools",
+        ":install-lua",
     ],
     visibility = ["//visibility:public"],
 )
@@ -265,8 +273,10 @@ kong_genrule(
         rm -rf ${BUILD_DESTDIR}/share ${BUILD_DESTDIR}/lib ${BUILD_DESTDIR}/etc
         LUAROCKS=$(dirname '$(location @luarocks//:luarocks_make)')/luarocks_tree
         cp -r ${LUAROCKS}/share ${LUAROCKS}/lib ${LUAROCKS}/etc ${BUILD_DESTDIR}/.
-        cp ${LUAROCKS}/bin/luarocks ${BUILD_DESTDIR}/bin/.
-        cp ${LUAROCKS}/bin/luarocks-admin ${BUILD_DESTDIR}/bin/.
+
+        TARGET_LUAROCKS=$(dirname '$(location @luarocks//:luarocks_target)')/luarocks_tree
+        cp ${TARGET_LUAROCKS}/bin/luarocks ${BUILD_DESTDIR}/bin/.
+        cp ${TARGET_LUAROCKS}/bin/luarocks-admin ${BUILD_DESTDIR}/bin/.
 
         mkdir -p ${BUILD_DESTDIR}/etc/kong/
         cp ${WORKSPACE_PATH}/kong.conf.default ${BUILD_DESTDIR}/etc/kong/kong.conf.default

build/luarocks/BUILD.luarocks.bazel

@@ -18,9 +18,8 @@ configure_make(
     configure_command = "configure",
     configure_in_place = True,
     configure_options = [
-        "--lua-suffix=jit",
-        "--with-lua=$$EXT_BUILD_DEPS/luajit",
-        "--with-lua-include=$$EXT_BUILD_DEPS/luajit/include/luajit-2.1",
+        "--with-lua=$$EXT_BUILD_DEPS/lua",
+        "--with-lua-include=$$EXT_BUILD_DEPS/lua/include",
     ],
     lib_source = ":all_srcs",
     out_bin_dir = "",
@@ -32,7 +31,7 @@ configure_make(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "@openresty//:luajit",
+        "@lua",
     ],
 )
 
@@ -46,6 +45,7 @@ kong_template_genrule(
         "//conditions:default": [
             "@luarocks//:luarocks_host",
             "@openresty//:luajit",
+            "@lua//:lua",
         ],
     }),
     is_executable = True,
@@ -58,6 +58,7 @@ kong_template_genrule(
         "@kong//:any-cross": [
             "@luarocks//:luarocks_host",
             "@openresty//:luajit",
+            "@lua//:lua",
         ],
         "//conditions:default": [],
     }),
@@ -86,6 +87,7 @@ kong_template_genrule(
         "//conditions:default": [
             "@luarocks//:luarocks_host",
             "@openresty//:luajit",
+            "@lua//:lua",
         ],
     }),
     is_executable = True,
@@ -102,6 +104,7 @@ kong_template_genrule(
         "@//:any-cross": [
             "@luarocks//:luarocks_host",
             "@openresty//:luajit",
+            "@lua//:lua",
         ],
         "//conditions:default": [],
     }),

build/luarocks/lua/BUILD.bazel

@@ -0,0 +1,16 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+
+exports_files(
+    [
+        "BUILD.lua.bazel",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+build_test(
+    name = "build",
+    targets = [
+        "@lua//:lua",
+    ],
+    visibility = ["//:__pkg__"],
+)

build/luarocks/lua/BUILD.lua.bazel

@@ -0,0 +1,38 @@
+load("@kong_bindings//:variables.bzl", "KONG_VAR")
+load("@rules_foreign_cc//foreign_cc:defs.bzl", "make")
+
+filegroup(
+    name = "all_srcs",
+    srcs = glob(
+        include = ["**"],
+        exclude = ["*.bazel"],
+    ),
+)
+
+make(
+    name = "lua",
+    args = select({
+        "@platforms//os:macos": [
+            "AR=/usr/bin/ar",
+        ],
+        "//conditions:default": [
+        ],
+    }),
+    lib_source = ":all_srcs",
+    out_binaries = [
+        "lua",
+    ],
+    targets = [
+        "-j" + KONG_VAR["NPROC"],
+        "install INSTALL_TOP=$$INSTALLDIR",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "lua_dir",
+    srcs = [
+        ":lua",
+    ],
+    output_group = "gen_dir",
+)

build/luarocks/lua/lua_repositories.bzl

@@ -0,0 +1,19 @@
+"""A module defining the third party dependency LUA"""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("@kong_bindings//:variables.bzl", "KONG_VAR")
+
+def lua_repositories():
+    maybe(
+        http_archive,
+        name = "lua",
+        build_file = "//build/luarocks/lua:BUILD.lua.bazel",
+        strip_prefix = "lua-5.4.7",
+        sha256 = "9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30",
+        urls = [
+            "https://www.lua.org/ftp/lua-5.4.7.tar.gz",
+        ],
+        patches = ["//build/luarocks/lua:patches/lua-cross.patch"],
+        patch_args = ["-p1"],
+    )

build/luarocks/lua/patches/lua-cross.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index b771196..cace616 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -6,7 +6,7 @@
+ # Your platform. See PLATS for possible values.
+ PLAT= guess
+
+-CC= gcc -std=gnu99
++CC?= gcc -std=gnu99
+ CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)

build/luarocks/luarocks_repositories.bzl

@@ -1,9 +1,12 @@
 """A module defining the third party dependency luarocks"""
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("//build/luarocks/lua:lua_repositories.bzl", "lua_repositories")
 load("@kong_bindings//:variables.bzl", "KONG_VAR")
 
 def luarocks_repositories():
+    lua_repositories()
+
     version = KONG_VAR["LUAROCKS"]
 
     http_archive(

build/luarocks/templates/luarocks_exec.sh

@@ -6,6 +6,7 @@ libxml2_path="invalid"
 openssl_path="{{@@openssl//:openssl}}"
 luarocks_host_path="{{@@luarocks//:luarocks_host}}"
 luajit_path="{{@@openresty//:luajit}}"
+lua_path="{{@@lua//:lua}}"
 kongrocks_path="invalid"
 cross_deps_libyaml_path="{{@@cross_deps_libyaml//:libyaml}}"
 CC={{CC}}
@@ -72,23 +73,28 @@ if [[ $CC != /* ]]; then
     LD=$root_path/$LD
 fi
 
-echo "
+cat << EOF > $ROCKS_CONFIG
 rocks_trees = {
     { name = [[system]], root = [[$ROCKS_DIR]] }
 }
-local_cache = '$CACHE_DIR'
-show_downloads = true
+lua_version = "5.1";
+lua_interpreter = "${luajit_path}/bin/luajit";
+local_cache = '$CACHE_DIR';
+show_downloads = true;
 gcc_rpath = false -- disable default rpath, add our own
 variables = {
     CC = '$CC',
     LD = '$LD',
     LDFLAGS = '-Wl,-rpath,$LIB_RPATH',
+    LUA_DIR = [[$root_path/$luajit_path]],
+    LUA_INCDIR = [[$root_path/$luajit_path/include/luajit-2.1]],
+    LUA_BINDIR = [[$root_path/$luajit_path/bin]]
 }
-" > $ROCKS_CONFIG
+EOF
 
 LUAROCKS_HOST=$luarocks_host_path
 
-host_luajit=$root_path/$luajit_path/bin/luajit
+host_lua=$root_path/$lua_path/bin/lua
 
 cat << EOF > $@
 LIB_RPATH=$LIB_RPATH
@@ -114,7 +120,7 @@ fi
 # force the interpreter here instead of invoking luarocks directly,
 # some distros has BINPRM_BUF_SIZE smaller than the shebang generated,
 # which is usually more than 160 bytes
-$host_luajit $root_path/$LUAROCKS_HOST/bin/luarocks \$private_rocks_args \$@ \\
+$host_lua $root_path/$LUAROCKS_HOST/bin/luarocks \$private_rocks_args \$@ \\
     OPENSSL_DIR=$OPENSSL_DIR \\
     CRYPTO_DIR=$OPENSSL_DIR \\
     EXPAT_DIR=$EXPAT_DIR \\

build/luarocks/templates/luarocks_target.sh

@@ -7,6 +7,7 @@ build_destdir="{{build_destdir}}"
 
 luarocks_exec="{{@@luarocks//:luarocks_exec}}"
 luajit_path="{{@@openresty//:luajit}}"
+lua_path="{{@@lua//:lua}}"
 luarocks_host_path="{{@@luarocks//:luarocks_host}}"
 luarocks_wrap_script="{{@@//build/luarocks:luarocks_wrap_script.lua}}"
 # template variables ends
@@ -22,7 +23,7 @@ rocks_tree=$(dirname $luarocks_exec)/luarocks_tree
 host_luajit=$luajit_path/bin/luajit
 
 host_luarocks_tree=$luarocks_host_path
-export LUA_PATH="$build_destdir/share/lua/5.1/?.lua;$build_destdir/share/lua/5.1/?/init.lua;$host_luarocks_tree/share/lua/5.1/?.lua;$host_luarocks_tree/share/lua/5.1/?/init.lua;;"
+export LUA_PATH="$build_destdir/share/lua/5.1/?.lua;$build_destdir/share/lua/5.4/?/init.lua;$host_luarocks_tree/share/lua/5.4/?.lua;$host_luarocks_tree/share/lua/5.1/?/init.lua;;"
 
 ROCKS_CONFIG="luarocks_make_config.lua"
 cat << EOF > $ROCKS_CONFIG
@@ -40,19 +41,23 @@ mkdir -p $rocks_tree/etc/luarocks
 cat << EOF > $rocks_tree/etc/luarocks/config-5.1.lua
 -- LuaRocks configuration
 rocks_trees = {
-        { name = "user", root = home .. "/.luarocks" };
-        { name = "system", root = "$install_destdir" };
-    }
-    lua_interpreter = "luajit";
-    variables = {
+    { name = "user", root = home .. "/.luarocks" };
+    { name = "system", root = "$install_destdir" };
+}
+lua_version = "5.1";
+lua_interpreter = "luajit";
+variables = {
     LUA_DIR = "$install_destdir/openresty/luajit";
     LUA_INCDIR = "$install_destdir/openresty/luajit/include/luajit-2.1";
     LUA_BINDIR = "$install_destdir/openresty/luajit/bin";
 }
 EOF
+# make the config also available for interpreter lua too
+cp $rocks_tree/etc/luarocks/config-5.1.lua $rocks_tree/etc/luarocks/config-5.4.lua
 
 sed -i -e "s|$build_destdir|$install_destdir|g" $rocks_tree/bin/luarocks
 sed -i -e "s|$rocks_tree|$install_destdir|g" $rocks_tree/bin/luarocks
+sed -i -e "s|openresty/luajit/bin/luajit|kong/bin/lua|" $rocks_tree/bin/luarocks
 
 # only generate the output when the command succeeds
 mv $@.tmp $@

build/templates/venv-commons

@@ -32,6 +32,7 @@ echo "
 rocks_trees = {
     { name = [[system]], root = [[$ROCKS_ROOT]] }
 }
+lua_version = [[5.1]]
 " >| "$LUAROCKS_CONFIG"
 
 # duplicate package.[c]path even though we have set in resty-cli, so luajit and kong can consume