update action yml

fightroad · Nov 16, 2024 · d6ef410 · d6ef410
1 parent 89d7b87
commit d6ef410
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 32 deletions.
diff --git a/.github/workflows/build-IMM.yml b/.github/workflows/build-IMM.yml
@@ -140,34 +140,24 @@ jobs:
         make -j$(nproc) || make -j1 || make -j1 V=s
         echo "compile_status=success" >> $GITHUB_ENV
 
-    - name: copy to upload file
-      if: (!cancelled())
-      run: |
-        df -hT
-        mkdir upload
-        cp openwrt/bin/targets/*/*/*.tar.gz upload/
-
     - name: Package OpenWrt Firmware
       if: ${{ env.compile_status }} == 'success' && !cancelled()
       uses: unifreq/openwrt_packit@master
       env:
-        OPENWRT_ARMVIRT: openwrt/bin/targets/*/*/*.tar.gz
+        OPENWRT_ARMVIRT: openwrt/bin/targets/*/*/immortalwrt-armsr-armv8-generic-rootfs.tar.gz
         KERNEL_VERSION_NAME: 5.15.148
         KERNEL_AUTO_LATEST: false
         PACKAGE_SOC: s905d
         WHOAMI: fightroad
         SW_FLOWOFFLOAD: 0
         SFE_FLOW: 0
-
-    - name: mv output to upload file
-      run: mv /opt/openwrt_packit/output/* upload/
-
+
     - name: Upload OpenWrt Firmware to Release
       uses: ncipollo/release-action@main
       if: ${{ env.PACKAGED_STATUS == 'success' }} && !cancelled()
       with:
         tag: immortalwrt_N1_${{ env.PACKAGED_OUTPUTDATE }}
-        artifacts: upload/*
+        artifacts: /opt/openwrt_packit/output/*
         allowUpdates: true
         token: ${{ secrets.GITHUB_TOKEN }}
         body: |
@@ -183,5 +173,5 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        keep_latest: 5
+        keep_latest: 10
         delete_tags : true
diff --git a/.github/workflows/build-LEAN-X86.yml b/.github/workflows/build-LEAN-X86.yml
@@ -147,9 +147,38 @@ jobs:
         make -j$(nproc) || make -j1 || make -j1 V=s
         echo "compile_status=success" >> $GITHUB_ENV
    
-    - name : Upload packages
-      uses: actions/upload-artifact@master
-      if: always()
+    # - name : Upload packages
+      # uses: actions/upload-artifact@master
+      # if: always()
+      # with:
+        # name: OpenWrt-x86
+        # path: openwrt/bin/targets/
+    - name: cp output to upload file
+      run: |
+        df -hT
+        mkdir upload
+        cp openwrt/bin/targets/*/*/*.gz upload/
+        cp openwrt/bin/targets/*/*/*.vmdk upload/
+        
+    - name: Upload OpenWrt Firmware to Release
+      uses: ncipollo/release-action@main
+      with:
+        tag: OpenWrt_N1_${{ env.PACKAGED_OUTPUTDATE }}
+        artifacts: upload/*
+        allowUpdates: true
+        token: ${{ secrets.GITHUB_TOKEN }}
+        body: |
+          基于lean openwrt构建
+          首次使用建议全新刷写
+          * 基本信息
+          IP: 192.168.1.1
+          账户: root
+          密码: password
+          
+    - name: Delete old releases
+      uses: dev-drprasad/delete-older-releases@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        name: OpenWrt-x86
-        path: openwrt/bin/targets/
+        keep_latest: 10
+        delete_tags : true
diff --git a/.github/workflows/build-LEAN.yml b/.github/workflows/build-LEAN.yml
@@ -147,13 +147,6 @@ jobs:
         make -j$(nproc) || make -j1 || make -j1 V=s
         echo "compile_status=success" >> $GITHUB_ENV
 
-    - name: copy to upload file
-      if: (!cancelled())
-      run: |
-        df -hT
-        mkdir upload
-        cp openwrt/bin/targets/*/*/*.tar.gz upload/
-
     - name: Package OpenWrt Firmware
       if: ${{ env.compile_status }} == 'success' && !cancelled()
       uses: unifreq/openwrt_packit@master
@@ -165,16 +158,13 @@ jobs:
         WHOAMI: fightroad
         SW_FLOWOFFLOAD: 1
         SFE_FLOW: 0
-
-    - name: mv output to upload file
-      run: mv /opt/openwrt_packit/output/* upload/
-
+
     - name: Upload OpenWrt Firmware to Release
       uses: ncipollo/release-action@main
       if: ${{ env.PACKAGED_STATUS == 'success' }} && !cancelled()
       with:
         tag: OpenWrt_N1_${{ env.PACKAGED_OUTPUTDATE }}
-        artifacts: upload/*
+        artifacts: /opt/openwrt_packit/output/*
         allowUpdates: true
         token: ${{ secrets.GITHUB_TOKEN }}
         body: |
@@ -190,5 +180,5 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        keep_latest: 5
+        keep_latest: 10
         delete_tags : true