Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change: remove amesh from apisix-base #318

Merged
merged 2 commits into from
Sep 25, 2023
Merged

change: remove amesh from apisix-base #318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6bffb8
change: remove amesh from apisix-base
lingsamuel Jul 6, 2023
411e37a
Merge branch 'master' into remove-amesh
monkeyDluffy6017 Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions build-apisix-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
wasm_nginx_module_ver="main"
lua_var_nginx_module_ver="master"
grpc_client_nginx_module_ver="main"
amesh_ver="main"
debug_args="--with-debug"
OR_PREFIX=${OR_PREFIX:="/usr/local/openresty-debug"}
else
Expand All @@ -26,7 +25,6 @@ else
wasm_nginx_module_ver="0.6.5"
lua_var_nginx_module_ver="v0.5.3"
grpc_client_nginx_module_ver="v0.4.3"
amesh_ver="main"
debug_args=${debug_args:-}
OR_PREFIX=${OR_PREFIX:="/usr/local/openresty"}
fi
Expand Down Expand Up @@ -87,14 +85,6 @@ else
grpc-client-nginx-module-${grpc_client_nginx_module_ver}
fi

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

cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
./patch.sh ../openresty-${OPENRESTY_VERSION}
cd ..
Expand Down Expand Up @@ -196,10 +186,6 @@ cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
cd ..

cd amesh-${amesh_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" sh -c 'PATH="${PATH}:/usr/local/go/bin" make install'
cd ..

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