Build support for apk packages (#110 )

* Update build-module.yml Add support of *.apk packages used since 25.12.0 * Update build-module.yml * Update build-module.yml
Feat/update versions of packages (#111 )
2026-03-14 09:23:10 +00:00 · 2026-03-04 16:01:51 +07:00 · 2026-03-04 15:59:34 +07:00 · 2026-02-27 00:42:21 +07:00 · 2026-02-27 00:38:05 +07:00 · 2026-02-27 00:34:28 +07:00
5 changed files with 41 additions and 30 deletions
--- a/.github/workflows/build-module.yml
+++ b/.github/workflows/build-module.yml
@@ -12,18 +12,19 @@ on:
  workflow_dispatch:
    inputs:
      version:
-        description: 'OpenWRT version (e.g., 24.10.3)'
+        description: 'OpenWRT version (e.g., 24.10.5)'
        required: true
        type: string
      targets:
-        description: 'Targets (comma-separated, e.g., "stm32,ramips")'
-        required: true
+        description: 'Targets (comma-separated, optional)'
+        required: false
        type: string
      subtargets:
-        description: 'Subtargets (comma-separated, e.g., "stm32mp1,mt7621")'
-        required: true
+        description: 'Subtargets (comma-separated, optional)'
+        required: false
        type: string

+
 jobs:
  generate-config:
    runs-on: ubuntu-latest
@@ -38,16 +39,22 @@ jobs:
        with:
          node-version: '20.16.0'

-      - name: Get OpenWRT version from tag
-        id: get_version
+      - name: Get OpenWRT version from inputs or tag
        run: |
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
            echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
-            echo "TARGETS=${{ inputs.targets }}" >> $GITHUB_ENV
-            echo "SUBTARGETS=${{ inputs.subtargets }}" >> $GITHUB_ENV
-          elif [ "${{ github.event_name }}" == "workflow_call" ]; then
-            VERSION="${{ inputs.tag_name }}"
-            echo "VERSION=${VERSION#v}" >> $GITHUB_ENV
+
+            if [ -n "${{ inputs.targets }}" ]; then
+              echo "TARGETS=${{ inputs.targets }}" >> $GITHUB_ENV
+            fi
+
+            if [ -n "${{ inputs.subtargets }}" ]; then
+              echo "SUBTARGETS=${{ inputs.subtargets }}" >> $GITHUB_ENV
+            fi
+
+          elif [ "${{ github.event_name }}" = "workflow_call" ]; then
+            echo "VERSION=${{ inputs.tag_name }}" >> $GITHUB_ENV
+
          else
            echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
          fi
@@ -174,7 +181,7 @@ jobs:
          make package/amneziawg-tools/compile V=s
          
          echo "Build completed. Checking for built packages..."
-          find bin/ -name "*.ipk" | grep -E "(amneziawg|luci-proto-amneziawg|luci-i18n-amneziawg)" | head -10
+          find bin/ -name "*.?pk" | grep -E "(amneziawg|luci-proto-amneziawg|luci-i18n-amneziawg)" | head -10

      - name: Prepare artifacts
        run: |
@@ -185,10 +192,10 @@ jobs:
          postfix="v${{ matrix.build_env.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
          
          # Copy built packages
-          find "$SDK_DIR/bin/packages" -name "amneziawg-tools_*.ipk" -exec cp {} awgrelease/amneziawg-tools_${postfix}.ipk \; || echo "amneziawg-tools package not found"
-          find "$SDK_DIR/bin/packages" -name "luci-proto-amneziawg_*.ipk" -exec cp {} awgrelease/luci-proto-amneziawg_${postfix}.ipk \; || echo "luci-proto-amneziawg package not found"
-          find "$SDK_DIR/bin/packages" -name "luci-i18n-amneziawg-ru_*.ipk" -exec cp {} awgrelease/luci-i18n-amneziawg-ru_${postfix}.ipk \; || echo "luci-i18n-amneziawg-ru package not found"
-          find "$SDK_DIR/bin/targets" -name "kmod-amneziawg_*.ipk" -exec cp {} awgrelease/kmod-amneziawg_${postfix}.ipk \; || echo "kmod-amneziawg package not found"
+          find "$SDK_DIR/bin/packages" -name "amneziawg-tools*.?pk" -exec sh -c 'file="$1"; postfix="$2"; ext="${file##*.}"; cp "$file" "awgrelease/amneziawg-tools_${postfix}.${ext}"' _ {} "${postfix}" \; || echo "amneziawg-tools package not found"
+          find "$SDK_DIR/bin/packages" -name "luci-proto-amneziawg*.?pk" -exec sh -c 'file="$1"; postfix="$2"; ext="${file##*.}"; cp "$file" "awgrelease/luci-proto-amneziawg_${postfix}.${ext}"' _ {} "${postfix}" \; || echo "luci-proto-amneziawg package not found"
+          find "$SDK_DIR/bin/packages" -name "luci-i18n-amneziawg-ru*.?pk" -exec sh -c 'file="$1"; postfix="$2"; ext="${file##*.}"; cp "$file" "awgrelease/luci-i18n-amneziawg-ru_${postfix}.${ext}"' _ {} "${postfix}" \; || echo "luci-i18n-amneziawg-ru package not found"
+          find "$SDK_DIR/bin/targets" -name "kmod-amneziawg*.?pk" -exec sh -c 'file="$1"; postfix="$2"; ext="${file##*.}"; cp "$file" "awgrelease/kmod-amneziawg_${postfix}.${ext}"' _ {} "${postfix}" \; || echo "kmod-amneziawg package not found"
          
          echo "Built packages:"
          ls -la awgrelease/
@@ -196,5 +203,5 @@ jobs:
      - name: Release
        uses: softprops/action-gh-release@v1
        with:
-          files: awgrelease/*.ipk
+          files: awgrelease/*.?pk
          tag_name: v${{ matrix.build_env.tag }}
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![Downloads](https://img.shields.io/github/downloads/Slava-Shchipunov/awg-openwrt/total)
+
 # Пакеты amneziawg для роутеров с прошивкой OpenWRT

 ## Автоматическая настройка AmneziaWG для OpenWRT версии 23.05.0 и более новых
@@ -21,11 +23,12 @@ sh <(wget -O - https://raw.githubusercontent.com/Slava-Shchipunov/awg-openwrt/re
 5) [23.05.4](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.4)
 6) [23.05.5](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.5)
 7) AWG-2.0 [23.05.6](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.6)
-8) [24.10.0](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.0)
-9) [24.10.1](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.1)
-10) [24.10.2](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.2)
+8) [24.10.0](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.0) ([AWG-2.0 для 24.10.0](https://github.com/yanjore/awg-openwrt/releases/tag/v24.10.0) из форка, если кому-то понадобится)
+9) [24.10.1](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.1) ([AWG-2.0 для 24.10.1](https://github.com/yanjore/awg-openwrt/releases/tag/v24.10.1) из форка)
+10) [24.10.2](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.2) ([AWG-2.0 для 24.10.2](https://github.com/yanjore/awg-openwrt/releases/tag/v24.10.2) из форка)
 11) AWG-2.0 [24.10.3](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.3)
 12) AWG-2.0 [24.10.4](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.4)
+13) AWG-2.0 [24.10.5](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.5)

 Также запускал сборку для версии [22.03.7](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v22.03.7), но там для двух платформ сборка завершилась ошибкой. Так как это достаточно старая версия OpenWRT, я не стал разбираться, в чем проблема.

@@ -88,11 +91,12 @@ At the moment I have collected packages for all devices for OpenWRT versions:
 5) [23.05.4](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.4)
 6) [23.05.5](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.5)
 7) AWG-2.0 [23.05.6](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.6)
-8) [24.10.0](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.0)
-9) [24.10.1](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.1)
-10) [24.10.2](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.2)
+8) [24.10.0](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.0) ([AWG-2.0 for 24.10.0](https://github.com/yanjore/awg-openwrt/releases/tag/v24.10.0) from fork)
+9) [24.10.1](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.1) ([AWG-2.0 for 24.10.1](https://github.com/yanjore/awg-openwrt/releases/tag/v24.10.1) from fork)
+10) [24.10.2](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.2) ([AWG-2.0 for 24.10.2](https://github.com/yanjore/awg-openwrt/releases/tag/v24.10.2) from fork)
 11) AWG-2.0 [24.10.3](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.3)
 12) AWG-2.0 [24.10.4](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.4)
+13) AWG-2.0 [24.10.5](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.5)

 I also ran the build for version [22.03.7](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v22.03.7), but the build ended with an error for two platforms. Since this is a fairly old version of OpenWRT, I did not bother to figure out what the problem was.

--- a/amneziawg-tools/Makefile
+++ b/amneziawg-tools/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=amneziawg-tools
-PKG_VERSION:=1.0.20250903
+PKG_VERSION:=1.0.20260223
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
--- a/kmod-amneziawg/Makefile
+++ b/kmod-amneziawg/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=kmod-amneziawg
-PKG_VERSION:=1.0.20251104
+PKG_VERSION:=1.0.20260210
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
--- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js
+++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js
@@ -66,9 +66,9 @@ function generateDescription(name, texts) {
 }

 function buildSVGQRCode(data, code) {
-	// pixel size larger than 4 clips right and bottom edges of complex configs
+	// pixel size 3 for mobile browser
 	const options = {
-		pixelSize: 4,
+		pixelSize: 3,
 		whiteColor: 'white',
 		blackColor: 'black'
 	};
@@ -934,7 +934,7 @@ return network.registerProtocol('amneziawg', {
 					}, [
 						E('div', {
 							'class': 'qr-code',
-							'style': 'width:320px;flex:0 1 320px;text-align:center'
+							'style': 'text-align:center'
 						}, [
 							E('em', { 'class': 'spinning' }, [ _('Generating QR code…') ])
 						]),
Author	SHA1	Message	Date
CthulhuVRN	aa17c7a25c	Build support for apk packages (#110 ) * Update build-module.yml Add support of .apk packages used since 25.12.0 Update build-module.yml * Update build-module.yml	2026-03-04 16:01:51 +07:00
Slava-Shchipunov	46f0cba90b	Feat/update versions of packages (#111 ) * feat: up awg tools version * feat: up awg kernel module version --------- Co-authored-by: Svyatoslav Shchipunov <s.shchipunov@tinkoff.ru>	2026-03-04 15:59:34 +07:00
Slava-Shchipunov	ad4c3e27c0	docs: add fork references to AWG-2.0 release links Updated release links for AWG-2.0 versions to include fork references.	2026-02-27 00:42:21 +07:00
Slava-Shchipunov	d64ea7b53e	docs: add link to README Added a note about the AWG-2.0 fork for version 24.10.0.	2026-02-27 00:38:05 +07:00
Slava-Shchipunov	e075dcb43f	feat: update versions of packages (#109 ) * feat: up awg tools version * feat: up awg kernel module version --------- Co-authored-by: Svyatoslav Shchipunov <s.shchipunov@tinkoff.ru>	2026-02-27 00:34:28 +07:00
borisovmsw	449988b8e6	fix: fix QR code generation * Update amneziawg.js The QR code doesn't fit/isn't fully visible and can't be scanned. * pixel size QR-code Reduced the pixel size 3 so that the QR code is displayed fully on the smartphone browser.	2026-01-13 17:45:47 +07:00
Slava-Shchipunov	9591ffdebe	fix: fix issue 78 (#80 ) * fix: add patch to fix stats	2025-12-24 11:24:12 +07:00
Slava-Shchipunov	3498354348	feat: add manual run for all platforms (#79 ) Co-authored-by: Svyatoslav Shchipunov <s.shchipunov@tinkoff.ru>	2025-12-23 12:16:34 +07:00
Slava-Shchipunov	f4c13f262d	docs: fix shield	2025-12-22 14:15:15 +07:00
Slava-Shchipunov	6164b8e8d3	docs: add downloads counter to README.md	2025-12-22 14:14:06 +07:00
Slava-Shchipunov	c4e45cd3bc	docs: update README.md	2025-12-22 12:51:20 +07:00