diff --git a/VERSION b/VERSION index ab679818c..314c3d717 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.6 \ No newline at end of file +1.1.5 \ No newline at end of file diff --git a/build-api7ee-runtime.sh b/build-api7ee-runtime.sh index 1d8243e7f..43d33c86d 100755 --- a/build-api7ee-runtime.sh +++ b/build-api7ee-runtime.sh @@ -27,6 +27,7 @@ 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" @@ -129,6 +130,13 @@ 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} @@ -142,9 +150,11 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1 ./install-wasmtime.sh 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 @@ -162,7 +172,7 @@ fi ./configure --prefix="$OR_PREFIX" \ - --with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt" \ + --with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $cc_opt" \ --with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \ $debug_args \ --add-module=../mod_dubbo-${mod_dubbo_ver} \ @@ -172,6 +182,7 @@ 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 \ @@ -222,6 +233,10 @@ 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'}