From 62c3b93b42c187d3a3fc2899faabc6e953dfde0f Mon Sep 17 00:00:00 2001
From: spvkgn <spvkgn@users.noreply.github.com>
Date: Mon, 11 Nov 2024 15:43:06 +0500
Subject: [PATCH] test

---
 .github/workflows/build.yml | 87 +++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f2cf47c76..5a2dfb420 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,41 +12,42 @@ jobs:
     strategy:
       # max-parallel: 8
       matrix:
-        branch:
-          # - openwrt-22.03
-          - openwrt-23.05
-        arch:
-          # - aarch64_cortex-a53
-          # - aarch64_cortex-a72
-          # - aarch64_generic
-          # - arm_arm1176jzf-s_vfp
-          # - arm_arm926ej-s
-          # - arm_cortex-a15_neon-vfpv4
-          # - arm_cortex-a5_vfpv4
-          # - arm_cortex-a7
-          # - arm_cortex-a7_neon-vfpv4
-          # - arm_cortex-a7_vfpv4
-          # - arm_cortex-a8_vfpv3
-          # - arm_cortex-a9
-          # - arm_cortex-a9_neon
-          # - arm_cortex-a9_vfpv3-d16
-          # - arm_fa526
-          # - arm_mpcore
-          # - arm_xscale
-          # - mips64_octeonplus
-          # - mips_24kc
-          # - mips_4kec
-          # - mips_mips32
-          # - mipsel_24kc
-          # - mipsel_24kc_24kf
-          # - mipsel_74kc
-          # - mipsel_mips32
-          - x86_64
+        # branch:
+        #   - openwrt-22.03
+        #   - openwrt-23.05
+        # arch:
+        #   - aarch64_cortex-a53
+        #   - aarch64_cortex-a72
+        #   - aarch64_generic
+        #   - arm_arm1176jzf-s_vfp
+        #   - arm_arm926ej-s
+        #   - arm_cortex-a15_neon-vfpv4
+        #   - arm_cortex-a5_vfpv4
+        #   - arm_cortex-a7
+        #   - arm_cortex-a7_neon-vfpv4
+        #   - arm_cortex-a7_vfpv4
+        #   - arm_cortex-a8_vfpv3
+        #   - arm_cortex-a9
+        #   - arm_cortex-a9_neon
+        #   - arm_cortex-a9_vfpv3-d16
+        #   - arm_fa526
+        #   - arm_mpcore
+        #   - arm_xscale
+        #   - mips64_octeonplus
+        #   - mips_24kc
+        #   - mips_4kec
+        #   - mips_mips32
+        #   - mipsel_24kc
+        #   - mipsel_24kc_24kf
+        #   - mipsel_74kc
+        #   - mipsel_mips32
+        #   - x86_64
         include:
           # - branch: openwrt-21.02
           #   arch: mipsel_24kc
           - branch: SNAPSHOT
             arch: x86_64
+            pkg: apk
         # exclude:
         #   - branch: openwrt-21.02
         #     arch: arm_cortex-a7_vfpv4
@@ -87,6 +88,7 @@ jobs:
           TAG: ${{ github.event.client_payload.tag }}
           ARCH: ${{ matrix.arch }}
           BRANCH: ${{ matrix.branch }}
+          PKG: ${{ matrix.pkg }}
           SIGN_KEY: ${{ secrets.SIGN_PRIVATE_KEY }}
         run: |
           VERSION=${TAG}.$(date -d $DATE +%Y%m%d)
@@ -115,10 +117,11 @@ jobs:
           make package/far2l/compile V=s -j$(nproc) CONFIG_CCACHE=1 BUILD_LOG=1
           ./staging_dir/host/bin/ccache --dir .ccache --max-size=100M --show-stats
           rm -rf ./bin/packages/*/base/*
-          mv ./bin/packages/*/far2l/*.ipk ./bin/packages/*/base
+          ls -lh ./bin/packages/*/far2l
+          mv ./bin/packages/*/far2l/*.$PKG ./bin/packages/*/base
           echo "$SIGN_KEY" | base64 -d > key-build
           make package/index
-          tar -C ./bin/packages/*/base -cvf ipk-$BRANCH-$ARCH.tar --transform "s|^\./|${BRANCH/openwrt-}/$ARCH/|" --show-transformed-names .
+          tar -C ./bin/packages/*/base -cvf $PKG-$BRANCH-$ARCH.tar --transform "s|^\./|${BRANCH/openwrt-}/$ARCH/|" --show-transformed-names .
 
       - name: Compress build logs
         if: always()
@@ -132,8 +135,8 @@ jobs:
         if: steps.build.outcome == 'success'
         uses: actions/upload-artifact@v4
         with:
-          name: ipk-${{ matrix.branch }}-${{ matrix.arch }}
-          path: /builder/ipk-${{ matrix.branch }}-${{ matrix.arch }}.tar
+          name: ${{ matrix.pkg }}-${{ matrix.branch }}-${{ matrix.arch }}
+          path: /builder/*.tar
           if-no-files-found: error
 
       - name: Upload build logs
@@ -141,7 +144,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: logs-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/logs-${{ matrix.branch }}-${{ matrix.arch }}.tar.xz
+          path: logs-*.tar.xz
           # retention-days: 1
 
   gh-pages:
@@ -154,12 +157,12 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: ipk-*
+          pattern: '*pk-*'
 
       - name: Prepare files to publish
         run: |
           mkdir public
-          find . -name 'ipk-*.tar' -exec tar -C ./public -xvf {} \;
+          find . -name '*pk-*.tar' -exec tar -C ./public -xvf {} \;
 
       - name: Deploy to GH pages
         id: deploy
@@ -206,19 +209,17 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: ipk-openwrt-${{ matrix.branch }}-*
+          pattern: '*pk-openwrt-${{ matrix.branch }}-*'
 
-      - name: Put ipk into zip
-        id: zip
+      - name: Put packages into zip
         env:
           BRANCH: ${{ matrix.branch }}
         run: |
-          find . -name "ipk-openwrt-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.ipk' \;
+          find . -name "*-openwrt-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.*pk' \;
           mkdir -p public
-          find $BRANCH -mindepth 1 -type d -exec sh -c 'zip -0 ./public/far2l-$(basename {}).ipk.zip -j {} {}/*' \;
+          find $BRANCH -mindepth 1 -type d -exec sh -c 'zip -0 ./public/far2l-$(basename {}).zip -j {} {}/*' \;
 
       - name: Upload release assets
-        if: steps.zip.outcome == 'success'
         uses: andelf/nightly-release@main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}