[apisix] branch master updated: ci: move helper script to the right dir (#8691)

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 822d545c3 ci: move helper script to the right dir (#8691)
822d545c3 is described below

commit 822d545c3b0991269948fc2a8b684e484d06baf6
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Sun Jan 29 09:46:24 2023 +0800

    ci: move helper script to the right dir (#8691)
    
    Fixes https://github.com/apache/apisix/issues/8685
---
 .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(-)

diff --git a/.github/workflows/code-lint.yml b/.github/workflows/code-lint.yml
index c1ffccf30..c8303191b 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 f86221a1a..8103503d3 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 7fa165fb7..cb974524b 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 2ffa94cde..d49f271f6 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 cd4472521..4029d851b 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 695db94bd..99a9e0c7d 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
 }