From 4ad6c71dae30213a9bcba2055c9c67097c19fdb5 Mon Sep 17 00:00:00 2001 From: spacewander Date: Mon, 16 Jan 2023 15:15:17 +0800 Subject: [PATCH] ci: move helper script to the right dir Signed-off-by: spacewander --- .github/workflows/code-lint.yml | 2 +- ci/centos7-ci.sh | 2 +- {utils => ci}/linux-install-etcd-client.sh | 0 {utils => ci}/linux-install-openresty.sh | 0 ci/linux_apisix_current_luarocks_runner.sh | 4 ++-- ci/linux_apisix_master_luarocks_runner.sh | 4 ++-- ci/linux_openresty_common_runner.sh | 4 ++-- ci/performance_test.sh | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename {utils => ci}/linux-install-etcd-client.sh (100%) rename {utils => ci}/linux-install-openresty.sh (100%) diff --git a/.github/workflows/code-lint.yml b/.github/workflows/code-lint.yml index c1ffccf3069b..c8303191bf6a 100644 --- a/.github/workflows/code-lint.yml +++ b/.github/workflows/code-lint.yml @@ -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 diff --git a/ci/centos7-ci.sh b/ci/centos7-ci.sh index f86221a1ae6d..8103503d3256 100755 --- a/ci/centos7-ci.sh +++ b/ci/centos7-ci.sh @@ -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 diff --git a/utils/linux-install-etcd-client.sh b/ci/linux-install-etcd-client.sh similarity index 100% rename from utils/linux-install-etcd-client.sh rename to ci/linux-install-etcd-client.sh diff --git a/utils/linux-install-openresty.sh b/ci/linux-install-openresty.sh similarity index 100% rename from utils/linux-install-openresty.sh rename to ci/linux-install-openresty.sh diff --git a/ci/linux_apisix_current_luarocks_runner.sh b/ci/linux_apisix_current_luarocks_runner.sh index 7fa165fb7502..cb974524b8e3 100755 --- a/ci/linux_apisix_current_luarocks_runner.sh +++ b/ci/linux_apisix_current_luarocks_runner.sh @@ -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() { diff --git a/ci/linux_apisix_master_luarocks_runner.sh b/ci/linux_apisix_master_luarocks_runner.sh index 2ffa94cdef97..d49f271f648b 100755 --- a/ci/linux_apisix_master_luarocks_runner.sh +++ b/ci/linux_apisix_master_luarocks_runner.sh @@ -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() { diff --git a/ci/linux_openresty_common_runner.sh b/ci/linux_openresty_common_runner.sh index cd4472521378..4029d851bd16 100755 --- a/ci/linux_openresty_common_runner.sh +++ b/ci/linux_openresty_common_runner.sh @@ -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 diff --git a/ci/performance_test.sh b/ci/performance_test.sh index 695db94bd1cc..99a9e0c7d3cd 100755 --- a/ci/performance_test.sh +++ b/ci/performance_test.sh @@ -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 }