From 80518c32dc151f94f85fe3cceaf30e46d85f4cc9 Mon Sep 17 00:00:00 2001
From: remittor <remittor@gmail.com>
Date: Mon, 14 Oct 2024 19:56:45 +0300
Subject: [PATCH] [github] Update auto builder

---
 .github/workflows/build.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1684a71..0da6f20 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,28 +134,30 @@ jobs:
           #export PKG_VERSION=$(date --utc -d $DATE +%Y%m%d)
           #find $GITHUB_WORKSPACE/zapret-openwrt -type d -path '*/package/zapret' -exec cp -r {} ./package \;
           cp -r $GITHUB_WORKSPACE/zapret-openwrt ./package/zapret-openwrt/
-
+          
           mv feeds.conf.default feeds.conf
           sed -i -e 's|base.*\.git|base https://github.com/openwrt/openwrt.git|' feeds.conf
           sed -i -e 's|packages.*\.git|packages https://github.com/openwrt/packages.git|' feeds.conf
           sed -i -e 's|luci.*\.git|luci https://github.com/openwrt/luci.git|' feeds.conf
-
+          
           ./scripts/feeds update base packages luci
           ./scripts/feeds install -a
           
           make defconfig
-
           echo "------------- .config BEG -------------------"
           cat .config
           echo "------------- .config END -------------------"
-
+          
           PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
           make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
           
           find ./bin/packages/*/base -type f ! -regex ".*\(zapret\).*\.ipk$" -delete
-          echo "$SIGN_KEY" | base64 -d > key-build
           
+          #echo ">>>>>>> build a repository index to make the output directory usable as local OPKG source"
+          #ln -s `which usign` staging_dir/host/bin/usign
+          #echo "$SIGN_KEY" | base64 -d > key-build
           #make package/index
+          
           tar -C ./bin/packages/*/base -cvf $GITHUB_WORKSPACE/ipk-$BRANCH-$ARCH.tar --transform "s|^\./|${BRANCH/openwrt-}/$ARCH/|" --show-transformed-names .
           ./staging_dir/host/bin/ccache --max-size=10M --show-stats
 
@@ -214,9 +216,11 @@ jobs:
         uses: andelf/nightly-release@main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: ${{ matrix.branch }}
+          TAG: ${{ needs.check.outputs.tag }}
         with:
           prerelease: false
-          tag_name: ${{ matrix.branch }}
+          tag_name: ${{ needs.check.outputs.tag }}-${{ matrix.branch }}
           name: '${{ needs.check.outputs.tag }} for OpenWrt ${{ matrix.branch }}'
           body: |
             ${{ needs.check.outputs.url }}: ${{ needs.check.outputs.message }}