test 10

.github/workflows/build.yml

@@ -2,22 +2,19 @@ name: build
 
 on:
   workflow_dispatch:
-  push:
-    tags:
-      - v[0-9]+*
+#  push:
+#    tags:
+#      - v[0-9]+*
 
 env:
   REPO_URL: https://github.com/openwrt-xiaomi/openwrt.git
   REPO_BRANCH: xq-24.10
+  TAG_PREFIX: v24-
   BUILD_ROOT: ${{ github.workspace }}/openwrt
   DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
-  CUSTOM_FEEDS_SH: ${{ github.workspace }}/custom-feeds.sh
-  CUSTOM_PACKAGES_SH: ${{ github.workspace }}/custom-packages.sh
-  CUSTOM_CONFIG_SH: ${{ github.workspace }}/custom-config.sh
   TZ: UTC
   DEVICE_NAME: unknown
-  FILE_DATE: unknown
-  FIRMWARE: unknown  
+  BUILD_DATE: unknown
 
 jobs:
   check:
@@ -40,8 +37,10 @@ jobs:
           echo "Tag name from github.ref_name: ${{ github.ref_name }}"
           BRANCH=$(gh api repos/$REPO --jq '.default_branch')
           DATE=$(gh api repos/$REPO/commits/$BRANCH --jq '.commit.committer.date')
+          BUILD_DATE=$( date --utc +'%y%m%d' )
+          TAG=$TAG_PREFIX$BUILD_DATE
           {
-            echo "tag=$GITHUB_REF_NAME"
+            echo "tag=$TAG"
             echo "date=$(date --utc -d $DATE +%Y%m%d)"
             echo "sha=$(gh api repos/$REPO/commits/$BRANCH --jq '.sha[0:7]')"
             echo "url=$(gh api repos/$REPO/commits/$BRANCH --jq '.html_url')"
@@ -51,6 +50,8 @@ jobs:
             echo EOF
           } >> $GITHUB_OUTPUT
           echo "DATE=$DATE" >> $GITHUB_ENV
+          echo "BUILD_DATE=$BUILD_DATE" >> $GITHUB_ENV
+          echo "TAG=$TAG" >> $GITHUB_ENV
 
       - name: Check for repo activity
         id: activity
@@ -86,8 +87,8 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
-          #sudo apt-get -qq update && sudo apt-get -qq upgrade
           sudo apt-get -qq update
+          #sudo apt-get -qq update && sudo apt-get -qq upgrade
           sudo apt-get -qq install $(cat $DEPENDENCIES)
           sudo apt-get -qq autoremove --purge
           sudo apt-get -qq clean
@@ -148,8 +149,8 @@ jobs:
           echo "SUBTARGET_NAME=$SUBTARGET_NAME" >> $GITHUB_ENV
           echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
           echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
-          echo "FILE_DATE=$(date +"%y%m%d")" >> $GITHUB_ENV
-          echo "FILE_TIME=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
+          echo "FILE_DATE=$(date --utc +'%y%m%d')" >> $GITHUB_ENV
+          echo "FILE_TIME=$(date --utc +'%Y%m%d%H%M')" >> $GITHUB_ENV
 
       - name: Check space usage
         run: df -hT
@@ -223,10 +224,14 @@ jobs:
           DATE: ${{ needs.check.outputs.date }}
         run: |
           mkdir -p public
+          echo "-------------"
           ls -la
+          echo "------------- openwrt*"
+          ls -la ./openwrt*
+          echo "-------------"
           #find . -name "*-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.*pk' \;
-          #find $BRANCH -mindepth 1 -type d -exec sh -c 'zip -0 ./public/zapret_${TAG}_$(basename {}).zip -j {} {}/*' \;
-          #ls -lh ./public/*.zip
+          find openwrt -mindepth 1 -type d -exec sh -c 'zip -0 ./public/$(basename {}).zip -j {} {}/*' \;
+          ls -lh ./public/*.zip
 
       - name: Upload assets
         uses: andelf/nightly-release@main
@@ -236,7 +241,5 @@ jobs:
         with:
           prerelease: false
           tag_name: ${{ needs.check.outputs.tag }}
-          name: '${{ needs.check.outputs.tag }} for OpenWrt'
-          body: |
-            ${{ needs.check.outputs.url }}: ${{ needs.check.outputs.message }}
+          name: '${{ needs.check.outputs.tag }}'
           files: ./public/*.zip