From f520270864611c814a2059102038b351e614a4f4 Mon Sep 17 00:00:00 2001 From: Ivan Kvashonkin Date: Mon, 11 Nov 2024 21:23:25 +0300 Subject: [PATCH] refactor: Extract version from tag and add to translate ipk file --- .github/workflows/build.yml | 5 ++++- luci-app-podkop/Makefile | 10 ---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2cd624a..4509dc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,8 +26,11 @@ jobs: - name: Filter IPK files run: | + # Извлекаем версию из тега, убирая префикс 'v' + VERSION=${GITHUB_REF#refs/tags/v} + mkdir -p ./filtered-bin - cp ./bin/luci-i18n-podkop-ru_*.ipk ./filtered-bin/ + cp ./bin/luci-i18n-podkop-ru_*.ipk "./filtered-bin/luci-i18n-podkop-ru_${VERSION}.ipk" cp ./bin/podkop_*.ipk ./filtered-bin/ cp ./bin/luci-app-podkop_*.ipk ./filtered-bin/ diff --git a/luci-app-podkop/Makefile b/luci-app-podkop/Makefile index 470371f..5ec9d55 100644 --- a/luci-app-podkop/Makefile +++ b/luci-app-podkop/Makefile @@ -17,14 +17,4 @@ LUCI_LANGUAGES:=en ru include $(TOPDIR)/feeds/luci/luci.mk -define Package/luci-i18n-$(PKG_NAME)-$(1) - SECTION:=luci - CATEGORY:=LuCI - TITLE:=$(PKG_NAME) - $(1) translation - HIDDEN:=1 - DEFAULT:=LUCI_LANG_$(1)||ALL - VERSION:=$(PKG_VERSION_TRANS) - DEPENDS:=$(PKG_NAME) -endef - # call BuildPackage - OpenWrt buildroot signature \ No newline at end of file