ipk apk

Author: Roarcannotprogramming

.github/workflows/build_image_all.yml

@@ -137,28 +137,35 @@ jobs:
         arch: [x86-64, rockchip-armv8]
     name: Build Argon for OpenWRT-${{ matrix.arch }}-${{ matrix.version }}
     runs-on: ubuntu-latest
-    container: 
+    container:
       image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.version }}
       options: --user root
     defaults:
       run:
         shell: bash
     steps:
     - uses: actions/checkout@v4
+    - name: Set package extension
+      run: |
+        if [[ "${{ matrix.version }}" == 24.* ]]; then
+          echo "PKG_EXT=ipk" >> $GITHUB_ENV
+        else
+          echo "PKG_EXT=apk" >> $GITHUB_ENV
+        fi
     - name: Run Make
       run: |
         export VOLUME_HOME=$(pwd)
         export BUILD_DIR="/builder"
         export BUILDER="buildbot"
-        cd $BUILD_DIR 
+        cd $BUILD_DIR
         apt-get update
         apt install sudo -y
         sudo -u $BUILDER git clone https://github.com/jerrykuku/luci-theme-argon.git package/luci-theme-argon
         while ! sudo -u $BUILDER ./scripts/feeds update -a; do echo "Try again"; done
         sudo -u $BUILDER make defconfig
         sudo -u $BUILDER make package/luci-theme-argon/compile V=s -j1
         mkdir -p $VOLUME_HOME/luci-theme-argon
-        cp bin/packages/*/base/luci-theme-argon*.ipk $VOLUME_HOME/luci-theme-argon/ 
+        cp bin/packages/*/base/luci-theme-argon*.${{ env.PKG_EXT }} $VOLUME_HOME/luci-theme-argon/ 
     - uses: actions/upload-artifact@v4
       with:
         name: luci-theme-argon-${{ matrix.arch }}-${{ matrix.version }}
@@ -171,22 +178,29 @@ jobs:
       matrix:
         version: [24.10.5, 25.12.0-rc2]
         arch: [x86-64, rockchip-armv8]
-    name: Build Luci App Netdata for OpenWRT-${{ matrix.arch }}-${{ matrix.version }} 
+    name: Build Luci App Netdata for OpenWRT-${{ matrix.arch }}-${{ matrix.version }}
     runs-on: ubuntu-latest
-    container: 
+    container:
       image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.version }}
       options: --user root
     defaults:
       run:
         shell: bash
     steps:
     - uses: actions/checkout@v4
+    - name: Set package extension
+      run: |
+        if [[ "${{ matrix.version }}" == 24.* ]]; then
+          echo "PKG_EXT=ipk" >> $GITHUB_ENV
+        else
+          echo "PKG_EXT=apk" >> $GITHUB_ENV
+        fi
     - name: Run Make
       run: |
         export VOLUME_HOME=$(pwd)
         export BUILD_DIR="/builder"
         export BUILDER="buildbot"
-        cd $BUILD_DIR 
+        cd $BUILD_DIR
         apt-get update
         apt install sudo -y
         sudo -u $BUILDER git clone https://github.com/sirpdboy/luci-app-netdata package/luci-app-netdata
@@ -195,7 +209,7 @@ jobs:
         sudo -u $BUILDER make defconfig
         sudo -u $BUILDER make package/luci-app-netdata/compile V=s -j1
         mkdir -p $VOLUME_HOME/luci-app-netdata
-        cp bin/packages/*/base/luci-app-netdata*.ipk $VOLUME_HOME/luci-app-netdata/
+        cp bin/packages/*/base/luci-app-netdata*.${{ env.PKG_EXT }} $VOLUME_HOME/luci-app-netdata/
     - uses: actions/upload-artifact@v4
       with:
         name: luci-app-netdata-${{ matrix.arch }}-${{ matrix.version }}
@@ -260,10 +274,9 @@ jobs:
     - name: Prepare Packages
       run: |
         export VOLUME_HOME=${{ github.workspace }}
-        export BUILD_DIR="/builder"
-        export BUILDER="buildbot"
         mkdir -p $VOLUME_HOME/mypackages
-        mv $VOLUME_HOME/*.ipk $VOLUME_HOME/mypackages/
+        # Support both .ipk (24.x) and .apk (25.x) package formats
+        find $VOLUME_HOME -maxdepth 1 -type f \( -name "*.ipk" -o -name "*.apk" \) -exec mv {} $VOLUME_HOME/mypackages/ \;
 
     - name: Set profile
       run: |