Skip to content

Commit 3da99be

Browse files
committed
chore: remove grpc client
1 parent c92e592 commit 3da99be

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.5
1+
1.1.6

build-api7ee-runtime.sh

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ 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"
3130
lua_resty_events_ver="0.2.0"
3231

3332

@@ -130,14 +129,6 @@ else
130129
lua-var-nginx-module-${lua_var_nginx_module_ver}
131130
fi
132131

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
140-
141132
cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
142133
./patch.sh ../openresty-${OPENRESTY_VERSION}
143134
cd ..
@@ -152,9 +143,6 @@ cd ..
152143

153144
luajit_xcflags=${luajit_xcflags:="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT"}
154145
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"
158146

159147
cd openresty-${OPENRESTY_VERSION} || exit 1
160148

@@ -172,7 +160,7 @@ fi
172160

173161

174162
./configure --prefix="$OR_PREFIX" \
175-
--with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $cc_opt" \
163+
--with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt" \
176164
--with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \
177165
$debug_args \
178166
--add-module=../mod_dubbo-${mod_dubbo_ver} \
@@ -182,7 +170,6 @@ fi
182170
--add-module=../apisix-nginx-module-${apisix_nginx_module_ver}/src/meta \
183171
--add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
184172
--add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
185-
--add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
186173
--add-module=../lua-resty-events-${lua_resty_events_ver} \
187174
--with-poll_module \
188175
--with-pcre-jit \
@@ -233,10 +220,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
233220
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
234221
cd ..
235222

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

0 commit comments

Comments
 (0)