f

Signed-off-by: Nic <[email protected]>

Author: nic-6443

.github/workflows/package-apisix-rpm-ubi.yml

@@ -49,6 +49,7 @@ jobs:
         run: |
           wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
           git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git
+          ./build-apisix-dashboard.sh ./apisix
           make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 local_code_path=./apisix artifact=apisix-local
 
       - name: run ubi8 docker and mapping rpm into container

Makefile

@@ -195,7 +195,7 @@ endef
 build-apisix-rpm:
 ifeq ($(local_code_path), 0)
 	git clone -b $(checkout) $(apisix_repo) --depth 1 ./apisix
-	./build-apisix-ui.sh ./apisix
+	./build-apisix-dashboard.sh ./apisix
 	$(call build,apisix,apisix,rpm,"./apisix")
 	rm -fr ./apisix
 else
@@ -206,7 +206,7 @@ endif
 build-apisix-deb:
 ifeq ($(local_code_path), 0)
 	git clone -b $(checkout) $(apisix_repo) --depth 1 ./apisix
-	./build-apisix-ui.sh ./apisix
+	./build-apisix-dashboard.sh ./apisix
 	$(call build,apisix,apisix,deb,"./apisix")
 	rm -fr ./apisix
 else

build-apisix-ui.sh renamed to build-apisix-dashboard.sh

@@ -4,6 +4,10 @@ set -x
 
 cd $1
 source .requirements
+if [ -z "${APISIX_DASHBOARD_COMMIT:-}" ]; then
+    echo "Error: APISIX_DASHBOARD_COMMIT is not set or empty"
+    exit 1
+fi
 git clone --revision=${APISIX_DASHBOARD_COMMIT} --depth 1 https://github.com/apache/apisix-dashboard.git
 pushd apisix-dashboard
 # compile