chore: minor tweaks

monkeyDluffy6017 · Nov 3, 2023 · 888b469 · 888b469
1 parent 8703414
commit 888b469
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
           cache-name: cache-deps
         with:
           path: deps
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('apisix-master-0.rockspec') }}
 
       - name: Extract branch name
         if: ${{ startsWith(github.ref, 'refs/heads/release/') }}

diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
@@ -45,7 +45,7 @@ jobs:
         cache-name: cache-deps
       with:
         path: deps
-        key: ${{ runner.os }}-${{ env.cache-name }}-centos7-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+        key: ${{ runner.os }}-${{ env.cache-name }}-centos7-${{ hashFiles('apisix-master-0.rockspec') }}
 
     - name: Extract branch name
       if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
@@ -92,7 +92,7 @@ jobs:
         cd apisix-build-tools
         make package type=rpm app=apisix version=${VERSION} checkout=release/${VERSION} image_base=centos image_tag=7 local_code_path=./apisix
         cd ..
-        rm -rf $(ls -1 --ignore=apisix-build-tools --ignore=t --ignore=utils --ignore=ci --ignore=Makefile --ignore=rockspec)
+        rm -rf $(ls -1 -I apisix-build-tools -I t -I utils -I ci --ignore=Makefile -I "*.rockspec")
 
     - name: Build xDS library
       if: steps.test_env.outputs.type == 'last'

diff --git a/.github/workflows/cli-master.yml b/.github/workflows/cli-master.yml
@@ -43,7 +43,7 @@ jobs:
           cache-name: cache-deps
         with:
           path: deps
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.job_name }}-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.job_name }}-${{ hashFiles('apisix-master-0.rockspec') }}
 
       - name: Linux launch common services
         run: |

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -48,7 +48,7 @@ jobs:
           cache-name: cache-deps
         with:
           path: deps
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.job_name }}-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.job_name }}-${{ hashFiles('apisix-master-0.rockspec') }}
 
       - name: Linux launch common services
         run: |

diff --git a/.github/workflows/fips.yml b/.github/workflows/fips.yml
@@ -52,7 +52,7 @@ jobs:
           cache-name: cache-deps
         with:
           path: deps
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('apisix-master-0.rockspec') }}
 
       - name: Cache openssl-3.0 compilation
         id: cache-openssl

diff --git a/.github/workflows/fuzzing-ci.yaml b/.github/workflows/fuzzing-ci.yaml
@@ -37,7 +37,7 @@ jobs:
         cache-name: cache-deps
       with:
         path: deps
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('apisix-master-0.rockspec') }}
 
     - name: Linux launch common services
       run: |

diff --git a/.github/workflows/gm-cron.yaml b/.github/workflows/gm-cron.yaml
@@ -48,7 +48,7 @@ jobs:
           cache-name: cache-deps
         with:
           path: deps
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('apisix-master-0.rockspec') }}
 
       - name: Cache Tongsuo compilation
         id: cache-tongsuo

diff --git a/.github/workflows/gm.yml b/.github/workflows/gm.yml
@@ -49,7 +49,7 @@ jobs:
           cache-name: cache-deps
         with:
           path: deps
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('apisix-master-0.rockspec') }}
 
       - name: Cache Tongsuo compilation
         id: cache-tongsuo

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -28,7 +28,7 @@ jobs:
           cache-name: cache-deps
         with:
           path: deps
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.os_name }}-${{ hashFiles('apisix-master-0.rockspec') }}
 
       - name: Install Dependencies
         run: sudo ./ci/performance_test.sh install_dependencies

diff --git a/.github/workflows/redhat-ci.yaml b/.github/workflows/redhat-ci.yaml
@@ -41,7 +41,7 @@ jobs:
         cache-name: cache-deps
       with:
         path: deps
-        key: ${{ runner.os }}-${{ env.cache-name }}-ubi8.6-${{ hashFiles('rockspec/apisix-master-0.rockspec') }}
+        key: ${{ runner.os }}-${{ env.cache-name }}-ubi8.6-${{ hashFiles('apisix-master-0.rockspec') }}
 
     - name: Extract branch name
       if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
@@ -88,7 +88,7 @@ jobs:
         cd apisix-build-tools
         make package type=rpm app=apisix version=${VERSION} checkout=release/${VERSION} image_base=ubi image_tag=8.6 local_code_path=./apisix
         cd ..
-        rm -rf $(ls -1 --ignore=apisix-build-tools --ignore=t --ignore=utils --ignore=ci --ignore=Makefile --ignore=rockspec)
+        rm -rf $(ls -1 -I apisix-build-tools -I t -I utils -I ci --ignore=Makefile -I "*.rockspec")
 
     - name: Build xDS library
       if: steps.test_env.outputs.type == 'last'

diff --git a/Makefile b/Makefile
@@ -158,7 +158,7 @@ deps: runtime
 		$(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.OPENSSL_LIBDIR $(addprefix $(ENV_OPENSSL_PREFIX), /lib); \
 		$(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.OPENSSL_INCDIR $(addprefix $(ENV_OPENSSL_PREFIX), /include); \
 		[ '$(ENV_OS_NAME)' == 'darwin' ] && $(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL) variables.PCRE_INCDIR $(addprefix $(ENV_PCRE_PREFIX), /include); \
-		$(ENV_LUAROCKS) install rockspec/apisix-master-0.rockspec --tree deps --only-deps $(ENV_LUAROCKS_SERVER_OPT); \
+		$(ENV_LUAROCKS) install apisix-master-0.rockspec --tree deps --only-deps $(ENV_LUAROCKS_SERVER_OPT); \
 	else \
 		$(call func_echo_warn_status, "WARNING: You're not using LuaRocks 3.x; please remove the luarocks and reinstall it via https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh"); \
 		exit 1; \
@@ -433,8 +433,8 @@ compress-tar:
 	./apisix \
 	./bin \
 	./conf \
-	./rockspec/apisix-$(VERSION)*.rockspec \
-	./rockspec/apisix-master-0.rockspec \
+	./apisix-$(VERSION)*.rockspec \
+	./apisix-master-0.rockspec \
 	LICENSE \
 	Makefile \
 	NOTICE \

diff --git a/rockspec/apisix-master-0.rockspec → apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec → apisix-master-0.rockspec
diff --git a/ci/common.sh b/ci/common.sh
@@ -19,7 +19,7 @@ set -ex
 
 export_or_prefix() {
     export OPENRESTY_PREFIX="/usr/local/openresty-debug"
-    export APISIX_MAIN="https://raw.githubusercontent.com/apache/incubator-apisix/master/rockspec/apisix-master-0.rockspec"
+    export APISIX_MAIN="https://raw.githubusercontent.com/apache/incubator-apisix/master/apisix-master-0.rockspec"
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
     export OPENSSL111_BIN=$OPENRESTY_PREFIX/openssl111/bin/openssl
 }

diff --git a/ci/linux_apisix_current_luarocks_runner.sh b/ci/linux_apisix_current_luarocks_runner.sh
@@ -35,8 +35,8 @@ script() {
     sudo rm -rf /usr/local/share/lua/5.1/apisix
 
     # install APISIX with local version
-    luarocks install rockspec/apisix-master-0.rockspec --only-deps > build.log 2>&1 || (cat build.log && exit 1)
-    luarocks make rockspec/apisix-master-0.rockspec > build.log 2>&1 || (cat build.log && exit 1)
+    luarocks install apisix-master-0.rockspec --only-deps > build.log 2>&1 || (cat build.log && exit 1)
+    luarocks make apisix-master-0.rockspec > build.log 2>&1 || (cat build.log && exit 1)
     # ensure all files under apisix is installed
     diff -rq apisix /usr/local/share/lua/5.1/apisix
 

diff --git a/utils/check-version.sh b/utils/check-version.sh
@@ -69,7 +69,7 @@ fi
 
 
 # rockspec
-matched=`ls -l rockspec/ | grep  "$ver" `
+matched=`ls -l | grep  "$ver" `
 
 if [ -z "$matched" ]; then
     echo -e "${RED}failed: (rockspec) VERSION = $ver \"$ver\" ${NC}" 1>&2