From 52d1c5d95f5b57ab2665886d0fd99975b1fda783 Mon Sep 17 00:00:00 2001 From: itdoginfo Date: Thu, 9 Oct 2025 18:15:54 +0300 Subject: [PATCH] Fix PKG_VERSION -> PODKOP_VERSION --- .github/workflows/build.yml | 2 +- Dockerfile-apk | 8 ++++---- luci-app-podkop/Makefile | 2 +- podkop/Makefile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cd16c9..5c3fd3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: context: . tags: podkop:ci-${{ matrix.package_type }} build-args: | - PKG_VERSION=${{ needs.preparation.outputs.version }} + PODKOP_VERSION=${{ needs.preparation.outputs.version }} - name: Create ${{ matrix.package_type }} Docker container run: docker create --name ${{ matrix.package_type }} podkop:ci-${{ matrix.package_type }} diff --git a/Dockerfile-apk b/Dockerfile-apk index c5cbc48..5b362cc 100644 --- a/Dockerfile-apk +++ b/Dockerfile-apk @@ -1,11 +1,11 @@ FROM itdoginfo/openwrt-sdk-apk:09102025 -ARG PKG_VERSION -ENV PKG_VERSION=${PKG_VERSION} +ARG PODKOP_VERSION +ENV PODKOP_VERSION=${PODKOP_VERSION} COPY ./podkop /builder/package/feeds/utilities/podkop COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop RUN make defconfig && \ - make package/podkop/compile -j4 V=s && \ - make package/luci-app-podkop/compile -j4 V=s \ No newline at end of file + make package/podkop/compile -j1 V=s && \ + make package/luci-app-podkop/compile -j1 V=s \ No newline at end of file diff --git a/luci-app-podkop/Makefile b/luci-app-podkop/Makefile index 9cb87e3..f6ae3a0 100644 --- a/luci-app-podkop/Makefile +++ b/luci-app-podkop/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-podkop -PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),0.$(shell date +%d%m%Y)) +PKG_VERSION := $(if $(PODKOP_VERSION),$(PODKOP_VERSION),0.$(shell date +%d%m%Y)) PKG_RELEASE:=1 diff --git a/podkop/Makefile b/podkop/Makefile index f3c639d..b4f4b84 100644 --- a/podkop/Makefile +++ b/podkop/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podkop -PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),0.$(shell date +%d%m%Y)) +PKG_VERSION := $(if $(PODKOP_VERSION),$(PODKOP_VERSION),0.$(shell date +%d%m%Y)) PKG_RELEASE:=1