Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-06 03:26:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix #211

Browse Source
This commit is contained in:
itdoginfo
2025-10-09 14:40:45 +03:00
parent 914e1792f3
commit 455c19ab2e
7 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/build.yml vendored
View File

@@ -19,7 +19,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- id: version - id: version
run: | run: |
VERSION=$(git describe --tags --exact-match 2>/dev/null || echo "dev_$(date +%d%m%Y)") VERSION=$(git describe --tags --exact-match 2>/dev/null || echo "0.$(date +%d%m%Y)")
echo "version=$VERSION" >> "$GITHUB_OUTPUT" echo "version=$VERSION" >> "$GITHUB_OUTPUT"
build: build:
@@ -51,10 +51,10 @@ jobs:
- name: Copy files from ${{ matrix.package_type }} Docker container - name: Copy files from ${{ matrix.package_type }} Docker container
run: | run: |
mkdir -p ./bin/${{ matrix.package_type }} mkdir -p ./bin/${{ matrix.package_type }}
docker cp ${{ matrix.package_type }}:/builder/bin/packages/x86_64/utilites/. ./bin/${{ matrix.package_type }}/ docker cp ${{ matrix.package_type }}:/builder/bin/packages/x86_64/utilities/. ./bin/${{ matrix.package_type }}/
docker cp ${{ matrix.package_type }}:/builder/bin/packages/x86_64/luci/. ./bin/${{ matrix.package_type }}/ docker cp ${{ matrix.package_type }}:/builder/bin/packages/x86_64/luci/. ./bin/${{ matrix.package_type }}/
# Проблема в том, что sdk которая генерирует apk файлы не использует `_` символ --> только `-` в именах итоговых файлов # IPK uses underscore `_` in filenames, while APK uses only dash `-`
- name: Fix naming difference between build for packages (replace _ with -) - name: Fix naming difference between build for packages (replace _ with -)
if: matrix.package_type == 'ipk' if: matrix.package_type == 'ipk'
shell: bash shell: bash
@@ -69,13 +69,13 @@ jobs:
- name: Filter files - name: Filter files
shell: bash shell: bash
run: | run: |
# Извлекаем версию из тега, убирая префикс 'v' # Extract version from tag, removing 'v' prefix
VERSION=${GITHUB_REF#refs/tags/v} VERSION=${GITHUB_REF#refs/tags/v}
mkdir -p ./filtered-bin/${{ matrix.package_type }} mkdir -p ./filtered-bin/${{ matrix.package_type }}
cp ./bin/${{ matrix.package_type }}/luci-i18n-podkop-ru-*.${{ matrix.package_type }} "./filtered-bin/luci-i18n-podkop-ru-${VERSION}.${{ matrix.package_type }}" cp ./bin/${{ matrix.package_type }}/luci-i18n-podkop-ru-*.${{ matrix.package_type }} "./filtered-bin/${{ matrix.package_type }}/luci-i18n-podkop-ru-${VERSION}.${{ matrix.package_type }}"
cp ./bin/${{ matrix.package_type }}/podkop-*.${{ matrix.package_type }} ./filtered-bin/ cp ./bin/${{ matrix.package_type }}/podkop-*.${{ matrix.package_type }} ./filtered-bin/${{ matrix.package_type }}/
cp ./bin/${{ matrix.package_type }}/luci-app-podkop-*.${{ matrix.package_type }} ./filtered-bin/ cp ./bin/${{ matrix.package_type }}/luci-app-podkop-*.${{ matrix.package_type }} ./filtered-bin/${{ matrix.package_type }}/
- name: Remove Docker container - name: Remove Docker container
run: docker rm ${{ matrix.package_type }} run: docker rm ${{ matrix.package_type }}
@@ -113,7 +113,7 @@ jobs:
uses: softprops/action-gh-release@v2.4.0 uses: softprops/action-gh-release@v2.4.0
with: with:
files: ./filtered-bin/release/*.* files: ./filtered-bin/release/*.*
draft: false draft: true
prerelease: false prerelease: true
name: ${{ github.ref_name }} name: ${{ github.ref_name }}
tag_name: ${{ github.ref_name }} tag_name: ${{ github.ref_name }}

7
Dockerfile-apk
View File

@@ -1,9 +1,6 @@
FROM itdoginfo/openwrt-sdk-apk:09102025 FROM itdoginfo/openwrt-sdk-apk:09102025
ARG PKG_VERSION COPY ./podkop /builder/package/feeds/utilities/podkop
ENV PKG_VERSION=${PKG_VERSION}
COPY ./podkop /builder/package/feeds/utilites/podkop
COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop
RUN make defconfig && make package/podkop/compile && make package/luci-app-podkop/compile V=s -j4 RUN make defconfig && make package/podkop/compile -j4 V=s && make package/luci-app-podkop/compile -j4 V=s

4
Dockerfile-ipk
View File

@@ -3,7 +3,7 @@ FROM itdoginfo/openwrt-sdk-ipk:24.10.3
ARG PKG_VERSION ARG PKG_VERSION
ENV PKG_VERSION=${PKG_VERSION} ENV PKG_VERSION=${PKG_VERSION}
COPY ./podkop /builder/package/feeds/utilites/podkop COPY ./podkop /builder/package/feeds/utilities/podkop
COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop
RUN make defconfig && make package/podkop/compile && make package/luci-app-podkop/compile V=s -j4 RUN make defconfig && make package/podkop/compile V=s -j4 && make package/luci-app-podkop/compile V=s -j4

2
luci-app-podkop/Makefile
View File

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-podkop PKG_NAME:=luci-app-podkop
PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),dev_$(shell date +%d%m%Y)) PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),0.$(shell date +%d%m%Y))
PKG_RELEASE:=1 PKG_RELEASE:=1

2
podkop/Makefile
View File

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=podkop PKG_NAME:=podkop
PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),dev_$(shell date +%d%m%Y)) PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),0.$(shell date +%d%m%Y))
PKG_RELEASE:=1 PKG_RELEASE:=1

2
sdk/Dockerfile-sdk-apk
View File

@@ -3,5 +3,5 @@ WORKDIR /builder
RUN ./setup.sh \ RUN ./setup.sh \
&& ./scripts/feeds update -a \ && ./scripts/feeds update -a \
&& ./scripts/feeds install luci-base \ && ./scripts/feeds install luci-base \
&& mkdir -p /builder/package/feeds/utilites/ \ && mkdir -p /builder/package/feeds/utilities/ \
&& mkdir -p /builder/package/feeds/luci/ && mkdir -p /builder/package/feeds/luci/

2
sdk/Dockerfile-sdk-ipk
View File

@@ -2,5 +2,5 @@ FROM openwrt/sdk:x86_64-v24.10.3
WORKDIR /builder WORKDIR /builder
RUN ./scripts/feeds update -a \ RUN ./scripts/feeds update -a \
&& ./scripts/feeds install luci-base \ && ./scripts/feeds install luci-base \
&& mkdir -p /builder/package/feeds/utilites/ \ && mkdir -p /builder/package/feeds/utilities/ \
&& mkdir -p /builder/package/feeds/luci/ && mkdir -p /builder/package/feeds/luci/