chore: update the branch used by package-apisix CI to master (#359)

api7 · Dec 27, 2023 · 4ff4171 · 4ff4171
1 parent 755d175
commit 4ff4171
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/package-apisix-deb-ubuntu20.04.yml b/.github/workflows/package-apisix-deb-ubuntu20.04.yml
@@ -20,7 +20,7 @@ jobs:
     timeout-minutes: 60
     env:
       PACKAGE_APISIX_VERSION: 0.0.0
-      APISIX_VERSION: 3.7.0
+      APISIX_VERSION: master
     steps:
       - uses: actions/checkout@v2
 

diff --git a/.github/workflows/package-apisix-rpm-el7.yml b/.github/workflows/package-apisix-rpm-el7.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      APISIX_VERSION: 3.7.0
+      APISIX_VERSION: master
     services:
       etcd:
         image: bitnami/etcd:3.4.0

diff --git a/.github/workflows/package-apisix-rpm-el8.yml b/.github/workflows/package-apisix-rpm-el8.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      APISIX_VERSION: 3.7.0
+      APISIX_VERSION: master
     services:
       etcd:
         image: bitnami/etcd:3.4.0

diff --git a/.github/workflows/package-apisix-rpm-ubi.yml b/.github/workflows/package-apisix-rpm-ubi.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      APISIX_VERSION: 3.7.0
+      APISIX_VERSION: master
     services:
       etcd:
         image: bitnami/etcd:3.4.0

diff --git a/utils/install-common.sh b/utils/install-common.sh
@@ -92,13 +92,13 @@ install_apisix() {
     # patch rockspec file to install with local repo
     sed -re '/^\s*source\s*=\s*\{$/{:src;n;s/^(\s*url\s*=).*$/\1".\/apisix",/;/\}/!bsrc}' \
          -e '/^\s*source\s*=\s*\{$/{:src;n;/^(\s*branch\s*=).*$/d;/\}/!bsrc}' \
-         -i rockspec/apisix-master-${iteration}.rockspec
+         -i apisix-master-${iteration}.rockspec
 
     # install rust
     install_rust
 
     # build the lib and specify the storage path of the package installed
-    luarocks make ./rockspec/apisix-master-${iteration}.rockspec --tree=/tmp/build/output/apisix/usr/local/apisix/deps --local
+    luarocks make ./apisix-master-${iteration}.rockspec --tree=/tmp/build/output/apisix/usr/local/apisix/deps --local
     chown -R "$(whoami)":"$(whoami)" /tmp/build/output
     cd ..
     # copy the compiled files to the package install directory