f

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

Author: nic-6443

.github/workflows/package-apisix-deb-ubuntu20.04.yml

@@ -33,7 +33,6 @@ jobs:
       
       - name: run apisix packaging
         run: |
-          wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
           make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${APISIX_RUNTIME} checkout=${APISIX_VERSION} image_base=ubuntu image_tag=24.04
 
       - name: install apisix deb into container

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

@@ -18,7 +18,6 @@ jobs:
     timeout-minutes: 60
     env:
       APISIX_VERSION: master
-      APISIX_RUNTIME: sy/update-ubi9
     services:
       etcd:
         image: bitnami/etcd:3.4.0

Makefile

@@ -257,22 +257,30 @@ package-dashboard-deb:
 .PHONY: build-apisix-runtime-rpm
 build-apisix-runtime-rpm:
 ifeq ($(app),apisix)
+ifneq ($(runtime_version),0)
 	git clone -b apisix-runtime/$(runtime_version) $(apisix_runtime_repo) ./apisix-runtime
 	$(call build_runtime,apisix-runtime,apisix-runtime,rpm,"./apisix-runtime")
 	rm -fr ./apisix-runtime
 else
 	$(call build_runtime,apisix-runtime,apisix-runtime,rpm,"./")
 endif
+else
+	$(call build_runtime,apisix-runtime,apisix-runtime,rpm,"./")
+endif
 
 .PHONY: build-apisix-runtime-deb
 build-apisix-runtime-deb:
 ifeq ($(app),apisix)
+ifneq ($(runtime_version),0)
 	git clone -b apisix-runtime/$(runtime_version) $(apisix_runtime_repo) ./apisix-runtime
 	$(call build_runtime,apisix-runtime,apisix-runtime,deb,"./apisix-runtime")
 	rm -fr ./apisix-runtime
 else
 	$(call build_runtime,apisix-runtime,apisix-runtime,deb,"./")
 endif
+else
+	$(call build_runtime,apisix-runtime,apisix-runtime,deb,"./")
+endif
 
 ### build rpm for apisix-runtime:
 .PHONY: package-apisix-runtime-rpm