Skip to content

Commit 211f8f6

Browse files
authored
build: depend on a rapidjson rock that is not tied to the build host CPU (#13824)
1 parent 5dd7b9f commit 211f8f6

4 files changed

Lines changed: 1 addition & 54 deletions

File tree

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ deps: install-runtime
137137
$(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.OPENSSL_LIBDIR $(addprefix $(ENV_OPENSSL_PREFIX), /lib); \
138138
$(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.OPENSSL_INCDIR $(addprefix $(ENV_OPENSSL_PREFIX), /include); \
139139
$(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.YAML_DIR $(ENV_LIBYAML_INSTALL_PREFIX); \
140-
LUAROCKS=$(ENV_LUAROCKS) ./ci/install-lua-rapidjson.sh deps; \
141140
$(ENV_LUAROCKS) install apisix-master-0.rockspec --tree deps --only-deps $(ENV_LUAROCKS_SERVER_OPT); \
142141
else \
143142
$(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"); \

‎apisix-master-0.rockspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ dependencies = {
8787
"api7-lua-resty-aws == 2.0.2-1",
8888
"multipart = 0.5.11-1",
8989
"luautf8 = 0.2.0-1",
90-
"rapidjson = 0.7.2-1",
90+
"api7-lua-rapidjson = 0.7.2-0",
9191
}
9292

9393
build = {

‎ci/install-lua-rapidjson.sh‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎ci/linux_apisix_current_luarocks_runner.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ script() {
4444
sudo rm -rf /usr/local/share/lua/5.1/apisix
4545

4646
# install APISIX with local version
47-
./ci/install-lua-rapidjson.sh
4847
luarocks install apisix-master-0.rockspec --only-deps > build.log 2>&1 || (cat build.log && exit 1)
4948
luarocks make apisix-master-0.rockspec > build.log 2>&1 || (cat build.log && exit 1)
5049
# ensure all files under apisix is installed

0 commit comments

Comments
 (0)