From 4ff4171d42b02ae28e53c2fe55fa20d40379f8d7 Mon Sep 17 00:00:00 2001
From: AlinsRan <alinsran333@gmail.com>
Date: Wed, 27 Dec 2023 13:55:16 +0800
Subject: [PATCH] chore: update the branch used by package-apisix CI to master
 (#359)

---
 .github/workflows/package-apisix-deb-ubuntu20.04.yml | 2 +-
 .github/workflows/package-apisix-rpm-el7.yml         | 2 +-
 .github/workflows/package-apisix-rpm-el8.yml         | 2 +-
 .github/workflows/package-apisix-rpm-ubi.yml         | 2 +-
 utils/install-common.sh                              | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/package-apisix-deb-ubuntu20.04.yml b/.github/workflows/package-apisix-deb-ubuntu20.04.yml
index 31c1d6dcd..20698a126 100644
--- 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
index 69a315c6b..8e5093aa6 100644
--- 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
index c18c48fd5..a057071f1 100644
--- 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
index 5e68850e9..b3b49fd69 100644
--- 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
index c8a1961bf..6e0037a5f 100755
--- 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