Skip to content

Commit c92e592

Browse files
authored
revert: grpc client engine (#413)
1 parent c822f27 commit c92e592

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.6
1+
1.1.5

build-api7ee-runtime.sh

+17-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ mod_dubbo_ver="1.0.2"
2727
apisix_nginx_module_ver="1.16.3"
2828
wasm_nginx_module_ver="0.6.5"
2929
lua_var_nginx_module_ver="v0.5.3"
30+
grpc_client_nginx_module_ver="v0.4.4"
3031
lua_resty_events_ver="0.2.0"
3132

3233

@@ -129,6 +130,13 @@ else
129130
lua-var-nginx-module-${lua_var_nginx_module_ver}
130131
fi
131132

133+
if [ "$repo" == grpc-client-nginx-module ]; then
134+
cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
135+
else
136+
git clone --depth=1 -b $grpc_client_nginx_module_ver \
137+
https://github.com/api7/grpc-client-nginx-module \
138+
grpc-client-nginx-module-${grpc_client_nginx_module_ver}
139+
fi
132140

133141
cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
134142
./patch.sh ../openresty-${OPENRESTY_VERSION}
@@ -142,9 +150,11 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
142150
./install-wasmtime.sh
143151
cd ..
144152

145-
146153
luajit_xcflags=${luajit_xcflags:="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT"}
147154
no_pool_patch=${no_pool_patch:-}
155+
# TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
156+
# version of grpc-client-nginx-module
157+
grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so"
148158

149159
cd openresty-${OPENRESTY_VERSION} || exit 1
150160

@@ -162,7 +172,7 @@ fi
162172

163173

164174
./configure --prefix="$OR_PREFIX" \
165-
--with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt" \
175+
--with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $cc_opt" \
166176
--with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \
167177
$debug_args \
168178
--add-module=../mod_dubbo-${mod_dubbo_ver} \
@@ -172,6 +182,7 @@ fi
172182
--add-module=../apisix-nginx-module-${apisix_nginx_module_ver}/src/meta \
173183
--add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
174184
--add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
185+
--add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
175186
--add-module=../lua-resty-events-${lua_resty_events_ver} \
176187
--with-poll_module \
177188
--with-pcre-jit \
@@ -222,6 +233,10 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
222233
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
223234
cd ..
224235

236+
cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
237+
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
238+
cd ..
239+
225240
# package etcdctl
226241
ETCD_ARCH="amd64"
227242
ETCD_VERSION=${ETCD_VERSION:-'3.5.4'}

0 commit comments

Comments
 (0)