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

ci: move helper script to the right dir #8691

Merged
merged 1 commit into from
Jan 29, 2023
Merged

ci: move helper script to the right dir #8691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/code-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
export_or_prefix
export OPENRESTY_VERSION=default

./utils/linux-install-openresty.sh
./ci/linux-install-openresty.sh
./utils/linux-install-luarocks.sh
sudo luarocks install luacheck

Expand Down
2 changes: 1 addition & 1 deletion ci/centos7-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ install_dependencies() {
./utils/linux-install-luarocks.sh

# install etcdctl
./utils/linux-install-etcd-client.sh
./ci/linux-install-etcd-client.sh

# install vault cli capabilities
install_vault_cli
Expand Down
0 utils/linux-install-etcd-client.sh → ci/linux-install-etcd-client.sh
View file
Open in desktop
File renamed without changes.
0 utils/linux-install-openresty.sh → ci/linux-install-openresty.sh
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ci/linux_apisix_current_luarocks_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ do_install() {

export_or_prefix

./utils/linux-install-openresty.sh
./ci/linux-install-openresty.sh
./utils/linux-install-luarocks.sh
./utils/linux-install-etcd-client.sh
./ci/linux-install-etcd-client.sh
}

script() {
Expand Down
4 changes: 2 additions & 2 deletions ci/linux_apisix_master_luarocks_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ do_install() {

export_or_prefix

./utils/linux-install-openresty.sh
./ci/linux-install-openresty.sh
./utils/linux-install-luarocks.sh
./utils/linux-install-etcd-client.sh
./ci/linux-install-etcd-client.sh
}

script() {
Expand Down
4 changes: 2 additions & 2 deletions ci/linux_openresty_common_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ before_install() {
do_install() {
export_or_prefix

./utils/linux-install-openresty.sh
./ci/linux-install-openresty.sh

./utils/linux-install-luarocks.sh

./utils/linux-install-etcd-client.sh
./ci/linux-install-etcd-client.sh

create_lua_deps

Expand Down
2 changes: 1 addition & 1 deletion ci/performance_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ install_dependencies() {
apt-get -y install lua5.1 liblua5.1-0-dev libldap2-dev
export_or_prefix
export OPENRESTY_VERSION=source
./utils/linux-install-openresty.sh
./ci/linux-install-openresty.sh
bash utils/install-dependencies.sh install_luarocks
make deps
}
Expand Down