This is an automated email from the ASF dual-hosted git repository. wenming pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push: new c2ef083bd fix: temporary fix for broken luarocks server (#12277) c2ef083bd is described below commit c2ef083bd1fb8123c96e6c8513466fd3df13385e Author: Ashish Tiwari <ashishjaitiwari15112...@gmail.com> AuthorDate: Tue Jun 3 09:50:42 2025 +0530 fix: temporary fix for broken luarocks server (#12277) --- .github/workflows/code-lint.yml | 2 +- Makefile | 5 ++++- autodocs/generate.sh | 5 ++++- ci/common.sh | 5 ++++- ci/linux_apisix_current_luarocks_runner.sh | 5 ++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/code-lint.yml b/.github/workflows/code-lint.yml index 0fdbf289f..792224c4f 100644 --- a/.github/workflows/code-lint.yml +++ b/.github/workflows/code-lint.yml @@ -24,7 +24,7 @@ jobs: sudo -E ./ci/linux-install-openresty.sh ./utils/linux-install-luarocks.sh - sudo -E luarocks install luacheck + sudo -E luarocks install --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567 luacheck - name: Script run: | diff --git a/Makefile b/Makefile index 3d11ed94c..329b0ce94 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,10 @@ deps: install-runtime $(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.OPENSSL_LIBDIR $(addprefix $(ENV_OPENSSL_PREFIX), /lib); \ $(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.OPENSSL_INCDIR $(addprefix $(ENV_OPENSSL_PREFIX), /include); \ $(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.YAML_DIR $(ENV_LIBYAML_INSTALL_PREFIX); \ - $(ENV_LUAROCKS) install apisix-master-0.rockspec --tree deps --only-deps $(ENV_LUAROCKS_SERVER_OPT); \ + # --only-server is a temporary fix until https://github.com/luarocks/luarocks/issues/1797 is resolved. \ + # NOTE: This fix is taken from https://github.com/luarocks/luarocks/issues/1797#issuecomment-2927856212 \ + # and no packages after 29th May 2025 can be installed. This is to be removed as soon as the luarocks issue is fixed \ + $(ENV_LUAROCKS) install --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567 apisix-master-0.rockspec --tree deps --only-deps $(ENV_LUAROCKS_SERVER_OPT); \ else \ $(call func_echo_warn_status, "WARNING: You're not using LuaRocks 3.x; please remove the luarocks and reinstall it via https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh"); \ exit 1; \ diff --git a/autodocs/generate.sh b/autodocs/generate.sh index 4b918cd1a..38a8b386f 100755 --- a/autodocs/generate.sh +++ b/autodocs/generate.sh @@ -25,7 +25,10 @@ build() { apt-get -y update --fix-missing apt-get -y install lua5.1 liblua5.1-0-dev curl https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh -sL | bash - - luarocks install ldoc + # --only-server is a temporary fix until https://github.com/luarocks/luarocks/issues/1797 is resolved. \ + # NOTE: This fix is taken from https://github.com/luarocks/luarocks/issues/1797#issuecomment-2927856212 \ + # and no packages after 29th May 2025 can be installed. This is to be removed as soon as the luarocks issue is fixed \ + luarocks install --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567 ldoc # generate docs rm -rf autodocs/output || true diff --git a/ci/common.sh b/ci/common.sh index 3850460d8..08a091033 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -35,7 +35,10 @@ create_lua_deps() { make deps # just for jwt-auth test - luarocks install lua-resty-openssl --tree deps + # --only-server is a temporary fix until https://github.com/luarocks/luarocks/issues/1797 is resolved. \ + # NOTE: This fix is taken from https://github.com/luarocks/luarocks/issues/1797#issuecomment-2927856212 \ + # and no packages after 29th May 2025 can be installed. This is to be removed as soon as the luarocks issue is fixed \ + luarocks install --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567 lua-resty-openssl --tree deps # maybe reopen this feature later # luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1) diff --git a/ci/linux_apisix_current_luarocks_runner.sh b/ci/linux_apisix_current_luarocks_runner.sh index 39b9df8d0..89ce7978c 100755 --- a/ci/linux_apisix_current_luarocks_runner.sh +++ b/ci/linux_apisix_current_luarocks_runner.sh @@ -36,7 +36,10 @@ script() { sudo rm -rf /usr/local/share/lua/5.1/apisix # install APISIX with local version - luarocks install apisix-master-0.rockspec --only-deps > build.log 2>&1 || (cat build.log && exit 1) + # --only-server is a temporary fix until https://github.com/luarocks/luarocks/issues/1797 is resolved. \ + # NOTE: This fix is taken from https://github.com/luarocks/luarocks/issues/1797#issuecomment-2927856212 \ + # and no packages after 29th May 2025 can be installed. This is to be removed as soon as the luarocks issue is fixed \ + luarocks install --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567 apisix-master-0.rockspec --only-deps > build.log 2>&1 || (cat build.log && exit 1) luarocks make apisix-master-0.rockspec > build.log 2>&1 || (cat build.log && exit 1) # ensure all files under apisix is installed diff -rq apisix /usr/local/share/lua/5.1/apisix