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.

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: drop the support of shell script installation #4985

Merged
merged 1 commit into from
Sep 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions bin/apisix
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ if [ -s './apisix/cli/apisix.lua' ]; then
elif [ -s '/usr/local/share/lua/5.1/apisix/cli/apisix.lua' ]; then
# install via luarock
APISIX_LUA=/usr/local/share/lua/5.1/apisix/cli/apisix.lua
elif [ -s '/usr/local/apisix/deps/share/lua/5.1/apisix/cli/apisix.lua' ]; then
# install via shell
APISIX_LUA=/usr/local/apisix/deps/share/lua/5.1/apisix/cli/apisix.lua
else
# install via official rpm or docker
APISIX_LUA=/usr/local/apisix/apisix/cli/apisix.lua
Expand Down
18 changes: 0 additions & 18 deletions ci/linux_apisix_master_luarocks_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,6 @@ script() {
mkdir tmp && cd tmp
cp -r ../utils ./

# install APISIX by shell
sudo mkdir -p /usr/local/apisix/deps
sudo PATH=$PATH ./utils/install-apisix.sh install > build.log 2>&1 || (cat build.log && exit 1)
cp ../bin/apisix /usr/bin/apisix
tree /usr/local/apisix/

which apisix

# run test
sudo PATH=$PATH apisix help
sudo PATH=$PATH apisix init
sudo PATH=$PATH apisix start
sudo PATH=$PATH apisix quit
sudo PATH=$PATH apisix start
sudo PATH=$PATH apisix stop

sudo PATH=$PATH ./utils/install-apisix.sh remove > build.log 2>&1 || (cat build.log && exit 1)

# install APISIX by luarocks
sudo luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && exit 1)
cp ../bin/apisix /usr/local/bin/apisix
Expand Down
76 changes: 0 additions & 76 deletions utils/install-apisix.sh

This file was deleted.