From 3a37ec917281ea2e0b801bf729e9770fc1d6734c Mon Sep 17 00:00:00 2001 From: remittor Date: Tue, 16 Dec 2025 08:02:18 +0300 Subject: [PATCH] build: Add release number to pkg version string --- .github/workflows/build.yml | 2 ++ luci-app-zapret/Makefile | 3 ++- zapret-ip2net/Makefile | 3 ++- zapret-mdig/Makefile | 3 ++- zapret-tpws/Makefile | 3 ++- zapret/Makefile | 3 ++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe4dbb1..8a6f19a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -210,6 +210,8 @@ jobs: PKGDIR=$GITHUB_WORKSPACE/zapret-openwrt MKFN=$PKGDIR/luci-app-zapret/Makefile PKGVER=$( grep -s '^PKG_VERSION:=.*' $MKFN | cut -d'=' -f2 ) + PKGREL=$( grep -s '^PKG_RELEASE:=.*' $MKFN | cut -d'=' -f2 ) + [ "$PKGREL" != "1" ] && PKGVER=$PKGVER-r$PKGREL echo "PKG_VERSION = $PKGVER" cp -vr $PKGDIR ./package/zapret-openwrt/ diff --git a/luci-app-zapret/Makefile b/luci-app-zapret/Makefile index 64423d3..9401436 100644 --- a/luci-app-zapret/Makefile +++ b/luci-app-zapret/Makefile @@ -5,7 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-zapret -PKG_VERSION:=72.20251213 +PKG_VERSION:=72.20251216 +PKG_RELEASE:=1 PKG_LICENSE:=MIT PKG_MAINTAINER:=remittor diff --git a/zapret-ip2net/Makefile b/zapret-ip2net/Makefile index 25994dd..569605f 100644 --- a/zapret-ip2net/Makefile +++ b/zapret-ip2net/Makefile @@ -1,7 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zapret-ip2net -PKG_VERSION:=72.20251213 +PKG_VERSION:=72.20251216 +PKG_RELEASE:=1 PKG_MAINTAINER:=bol-van PKG_LICENSE:=MIT diff --git a/zapret-mdig/Makefile b/zapret-mdig/Makefile index eb83ed8..1133345 100644 --- a/zapret-mdig/Makefile +++ b/zapret-mdig/Makefile @@ -1,7 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zapret-mdig -PKG_VERSION:=72.20251213 +PKG_VERSION:=72.20251216 +PKG_RELEASE:=1 PKG_MAINTAINER:=bol-van PKG_LICENSE:=MIT diff --git a/zapret-tpws/Makefile b/zapret-tpws/Makefile index e8bb126..c48629c 100644 --- a/zapret-tpws/Makefile +++ b/zapret-tpws/Makefile @@ -1,7 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zapret-tpws -PKG_VERSION:=72.20251213 +PKG_VERSION:=72.20251216 +PKG_RELEASE:=1 PKG_MAINTAINER:=bol-van PKG_LICENSE:=MIT diff --git a/zapret/Makefile b/zapret/Makefile index 3fe241a..3c2b6b5 100644 --- a/zapret/Makefile +++ b/zapret/Makefile @@ -5,7 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zapret -PKG_VERSION:=72.20251213 +PKG_VERSION:=72.20251216 +PKG_RELEASE:=1 PKG_MAINTAINER:=bol-van PKG_LICENSE:=MIT