Skip to content

Commit

Permalink
chore: remove grpc client (#415)
Browse files Browse the repository at this point in the history
Signed-off-by: Nic <[email protected]>
Co-authored-by: Nic <[email protected]>
  • Loading branch information
AlinsRan and nic-6443 authored Dec 30, 2024
1 parent 247504b commit 49f73a8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 19 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.6
1.1.7
23 changes: 5 additions & 18 deletions build-api7ee-runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ mod_dubbo_ver="1.0.2"
apisix_nginx_module_ver="1.16.3"
wasm_nginx_module_ver="0.6.5"
lua_var_nginx_module_ver="v0.5.3"
grpc_client_nginx_module_ver="v0.4.4"
lua_resty_events_ver="0.2.0"


Expand Down Expand Up @@ -130,14 +129,6 @@ else
lua-var-nginx-module-${lua_var_nginx_module_ver}
fi

if [ "$repo" == grpc-client-nginx-module ]; then
cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
else
git clone --depth=1 -b $grpc_client_nginx_module_ver \
https://github.com/api7/grpc-client-nginx-module \
grpc-client-nginx-module-${grpc_client_nginx_module_ver}
fi

cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
./patch.sh ../openresty-${OPENRESTY_VERSION}
cd ..
Expand All @@ -152,9 +143,6 @@ cd ..

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

cd openresty-${OPENRESTY_VERSION} || exit 1

Expand All @@ -181,7 +169,7 @@ fi


./configure --prefix="$OR_PREFIX" \
--with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $cc_opt" \
--with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt" \
--with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \
$debug_args \
--add-module=../mod_dubbo-${mod_dubbo_ver} \
Expand All @@ -191,7 +179,6 @@ fi
--add-module=../apisix-nginx-module-${apisix_nginx_module_ver}/src/meta \
--add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
--add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
--add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
--add-module=../lua-resty-events-${lua_resty_events_ver} \
--with-poll_module \
--with-pcre-jit \
Expand Down Expand Up @@ -223,6 +210,10 @@ fi
$no_pool_patch \
-j`nproc`

# ref: https://github.com/api7/grpc-client-nginx-module/pull/34
# After loading Go code from .so, the signalfd doesn't work anymore
sed -i "s/#ifndef NGX_HTTP_LUA_HAVE_SIGNALFD/#ifdef NGX_HTTP_LUA_HAVE_SIGNALFD/" $(find -name 'ngx_auto_config.h')

make -j`nproc`
sudo make install
cd ..
Expand All @@ -242,10 +233,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
cd ..

cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
cd ..

# package etcdctl
ETCD_ARCH="amd64"
ETCD_VERSION=${ETCD_VERSION:-'3.5.4'}
Expand Down

0 comments on commit 49f73a8

Please sign in to comment.