update workflow

vickenli · Sep 17, 2023 · 4109820 · 4109820
1 parent 4599a08
commit 4109820
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.github/workflows/Build-OpenWrt_Multi-Platform(V2).yml b/.github/workflows/Build-OpenWrt_Multi-Platform(V2).yml
@@ -38,7 +38,7 @@ env:
   COMMIT_LOG_NUM: 1
   UPLOAD_BIN_DIR: false
   UPLOAD_FIRMWARE: true
-  UPLOAD_ARTIFACT: false
+  UPLOAD_ARTIFACT: true
   UPLOAD_RELEASE: true
   TZ: Asia/Shanghai
 
@@ -469,9 +469,6 @@ jobs:
         # echo "directory size:"
         # du -hs $GITHUB_WORKSPACE/openwrt/
 
-        grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' > DEVICE_NAME
-        [ -s DEVICE_NAME ] && echo "DEVICE_NAME=_$(cat DEVICE_NAME)" >> $GITHUB_ENV
-        echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
         df -hT
 
     - name: Upload Error Log To Artifact
@@ -502,7 +499,7 @@ jobs:
       uses: actions/upload-artifact@main
       if: steps.compile.outputs.status == 'success' && env.UPLOAD_BIN_DIR == 'true'
       with:
-        name: OpenWrt_bin${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}
+        name: OpenWrt_bin_${{ matrix.platforms }}_${{ needs.job_init.outputs.output_release_tag }}
         path: openwrt/bin
 
     - name: Organize Files
@@ -531,7 +528,7 @@ jobs:
       uses: actions/upload-artifact@main
       if: steps.organize.outputs.status == 'success' && env.UPLOAD_ARTIFACT == 'true' && !cancelled()
       with:
-        name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}
+        name: OpenWrt_firmware_${{ matrix.platforms }}_${{ needs.job_init.outputs.output_release_tag }}
         path: ${{ env.FIRMWARE }}
 
     - name: Generate Release Tag