diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a6d868..25a8abb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: fetch-depth: 0 - id: version 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" build: @@ -51,10 +51,10 @@ jobs: - name: Copy files from ${{ matrix.package_type }} Docker container run: | 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 }}/ - # Проблема в том, что sdk которая генерирует apk файлы не использует `_` символ --> только `-` в именах итоговых файлов + # IPK uses underscore `_` in filenames, while APK uses only dash `-` - name: Fix naming difference between build for packages (replace _ with -) if: matrix.package_type == 'ipk' shell: bash @@ -69,13 +69,13 @@ jobs: - name: Filter files shell: bash run: | - # Извлекаем версию из тега, убирая префикс 'v' + # Extract version from tag, removing 'v' prefix VERSION=${GITHUB_REF#refs/tags/v} 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 }}/podkop-*.${{ matrix.package_type }} ./filtered-bin/ - cp ./bin/${{ matrix.package_type }}/luci-app-podkop-*.${{ matrix.package_type }} ./filtered-bin/ + 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/${{ matrix.package_type }}/ + cp ./bin/${{ matrix.package_type }}/luci-app-podkop-*.${{ matrix.package_type }} ./filtered-bin/${{ matrix.package_type }}/ - name: Remove Docker container run: docker rm ${{ matrix.package_type }} @@ -113,7 +113,7 @@ jobs: uses: softprops/action-gh-release@v2.4.0 with: files: ./filtered-bin/release/*.* - draft: false - prerelease: false + draft: true + prerelease: true name: ${{ github.ref_name }} tag_name: ${{ github.ref_name }} \ No newline at end of file diff --git a/Dockerfile-apk b/Dockerfile-apk index 4c9a885..9f3bcbc 100644 --- a/Dockerfile-apk +++ b/Dockerfile-apk @@ -1,9 +1,6 @@ FROM itdoginfo/openwrt-sdk-apk:09102025 -ARG 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 -RUN make defconfig && make package/podkop/compile && make package/luci-app-podkop/compile V=s -j4 \ No newline at end of file +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 diff --git a/Dockerfile-ipk b/Dockerfile-ipk index aaa109e..f849885 100644 --- a/Dockerfile-ipk +++ b/Dockerfile-ipk @@ -3,7 +3,7 @@ FROM itdoginfo/openwrt-sdk-ipk:24.10.3 ARG 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 -RUN make defconfig && make package/podkop/compile && make package/luci-app-podkop/compile V=s -j4 \ No newline at end of file +RUN make defconfig && make package/podkop/compile V=s -j4 && make package/luci-app-podkop/compile V=s -j4 \ No newline at end of file diff --git a/luci-app-podkop/Makefile b/luci-app-podkop/Makefile index 94c0fdb..9cb87e3 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),dev_$(shell date +%d%m%Y)) +PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),0.$(shell date +%d%m%Y)) PKG_RELEASE:=1 diff --git a/podkop/Makefile b/podkop/Makefile index bacb7c1..f3c639d 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),dev_$(shell date +%d%m%Y)) +PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),0.$(shell date +%d%m%Y)) PKG_RELEASE:=1 diff --git a/sdk/Dockerfile-sdk-apk b/sdk/Dockerfile-sdk-apk index a2340dd..935a982 100644 --- a/sdk/Dockerfile-sdk-apk +++ b/sdk/Dockerfile-sdk-apk @@ -3,5 +3,5 @@ WORKDIR /builder RUN ./setup.sh \ && ./scripts/feeds update -a \ && ./scripts/feeds install luci-base \ - && mkdir -p /builder/package/feeds/utilites/ \ + && mkdir -p /builder/package/feeds/utilities/ \ && mkdir -p /builder/package/feeds/luci/ \ No newline at end of file diff --git a/sdk/Dockerfile-sdk-ipk b/sdk/Dockerfile-sdk-ipk index 4c19693..9b6eac5 100644 --- a/sdk/Dockerfile-sdk-ipk +++ b/sdk/Dockerfile-sdk-ipk @@ -2,5 +2,5 @@ FROM openwrt/sdk:x86_64-v24.10.3 WORKDIR /builder RUN ./scripts/feeds update -a \ && ./scripts/feeds install luci-base \ - && mkdir -p /builder/package/feeds/utilites/ \ + && mkdir -p /builder/package/feeds/utilities/ \ && mkdir -p /builder/package/feeds/luci/ \ No newline at end of file