更新自动打包和发布工作流，合并打包和发布作业；修复UPX支持逻辑，确保ARM64架构不使用UPX压缩

Author: God-2077

.github/workflows/auto_package_and_release.yml

@@ -1,4 +1,4 @@
-name: Auto Package and Release
+name: Package and Release
 
 on:
   workflow_dispatch:
@@ -7,47 +7,11 @@ on:
       - 'package/config.yml'
 
 jobs:
-  release:
-    name: release
-    runs-on: windows-latest
-    outputs:  # 新增 outputs 部分
-      release_id: ${{ steps.create_release.outputs.id }}
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # 获取所有历史记录以便生成标签
-    
-    - name: Generate version tag
-      id: version
-      run: |
-        # 使用 UTC 时间确保一致性
-        $date = (Get-Date).ToUniversalTime().ToString("yy.MM.dd")
-        $tag = "v$date"
-        $release = "Release $date"
-        echo "tag=$tag" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
-        echo "release_name=$release" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
-
-    - name: Create Release
-      id: create_release
-      uses: softprops/action-gh-release@v1  # 使用更活跃维护的 release 操作
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ steps.version.outputs.tag }}
-        name: ${{ steps.version.outputs.release_name }}
-        generate_release_notes: true
-        draft: false
-        prerelease: false
-
-  package:
-    needs: release
-    name: package
+  package-and-release:
     strategy:
       matrix:
-        os: [ubuntu-latest,	ubuntu-24.04-arm, windows-latest, windows-11-arm]
-
-    runs-on: ${{ matrix.os }}
+        os: [windows-latest, windows-11-arm]
+    runs-on: os.${{ matrix.os }}
 
     # 添加必要的权限
     permissions:
@@ -58,48 +22,34 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0  # 获取所有历史记录以便生成标签
-
-    - name: Tree (linux)
-      if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-24.04-arm' }}
-      run: |
-        pwd
-        tree
-
-    - name: Tree (Windows)
-      if: ${{ matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm' }}
-      run: |
-        chdir
-        tree
+    
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: '3.12'
 
-    - name: UPX Setup(Windows amd64)
-      if: ${{ matrix.os == 'windows-latest' }}
+    - name: Generate version tag
+      id: version
       run: |
-        mkdir upx
-        curl -o upx/upx.exe https://assets.ksable.top/github/upx/upx/v5.0.1/upx.exe
+        # 使用 UTC 时间确保一致性
+        $date = (Get-Date).ToUniversalTime().ToString("yy.MM.dd")
+        $tag = "v$date"
+        $release = "Release $date"
+        echo "tag=$tag" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+        echo "release_name=$release" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
     
-    - name: UPX Setup(Linux amd64)
-      if: ${{ matrix.os == 'ubuntu-latest' }}
-      run: |
-        mkdir upx
-        curl -o upx/upx https://assets.ksable.top/github/upx/upx/v5.0.1/linux-amd64/upx
-
-    - name: UPX Setup(Linux arm64)
-      if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
+    - name: UPX Setup(Windows amd64)
+      if: ${{ matrix.os == 'windows-latest' }}
       run: |
         mkdir upx
-        curl -o upx/upx https://assets.ksable.top/github/upx/upx/v5.0.1/linux-arm64/upx
+        curl -o upx/upx.exe https://assets.ksable.top/github/upx/upx/v5.0.1/windows-amd64/upx.exe
         
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller pyyaml
 
     - name: Fix Python encoding (Windows)
-      if: ${{ matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm'}}
       run: |
         # 设置Python使用UTF-8编码
         [System.Environment]::SetEnvironmentVariable('PYTHONUTF8', '1', 'Process')
@@ -110,42 +60,24 @@ jobs:
       run: |
         cd package
         python build.py config.yml
-
-    # - name: Check
-    #   run: |
-    #     python ./package/md5.py dist
         
-    # 检查 ./dist/ 是否存在文件（Linux）
-    - name: Check if ./dist exists and has files
-      if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-24.04-arm' }}
-      run: |
-        if [ -d "./dist" ] && [ -n "$(ls -A ./dist)" ]; then
-          echo "havefilel=1" >> $GITHUB_ENV
-
-        else
-          echo "havefilel=0" >> $GITHUB_ENV
-        fi
-
-    - name: Check if ./dist exists and has files (CMD)
-      if: ${{ matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm' }}
-      shell: cmd
-      run: |
-        if exist dist\ (
-          cd dist
-          for /f "delims=" %%a in ('dir /b 2^>nul') do (
-            echo havefilew=1 >> "%GITHUB_ENV%"
-            exit /b 0
-          )
-        )
-        echo havefile=0 >> "%GITHUB_ENV%"
-
+    - name: Create Release
+      id: create_release
+      uses: softprops/action-gh-release@v1  # 使用更活跃维护的 release 操作
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.version.outputs.tag }}
+        name: ${{ steps.version.outputs.release_name }}
+        generate_release_notes: true
+        draft: false
+        prerelease: false
+        
     - name: Upload Release Assets
-      if: ${{ env.havefilew == '1' || env.havefilel =='1'}}
       uses: xresloader/upload-to-github-release@main
       env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        file: "./dist/*.exe;./dist/*/*.exe;./dist/*"
-        release_id: ${{ needs.release.outputs.release_id }}  # 修正引用路径
-        verbose: false
-        overwrite: true
+        file: "./dist/*.exe;./dist/*.zip"
+        release_id: ${{ steps.create_release.outputs.id }}
+        verbose: true

package/build.py

@@ -105,14 +105,17 @@ def main():
                     print(f"警告: 图标文件不存在 {icon_path}")
 
             # 添加UPX选项
-            if use_upx:
-                if upx_dir.exists():
-                    cmd.extend(['--upx-dir', str(upx_dir)])
-                    print(f"使用UPX压缩: {upx_dir}")
-                else:
-                    print(f"警告: UPX目录不存在 {upx_dir}")
+            if arrch == "ARM64":
+                print("UPX不支持当前架构")
             else:
-                print("不使用UPX压缩")
+                if use_upx:
+                    if upx_dir.exists():
+                        cmd.extend(['--upx-dir', str(upx_dir)])
+                        print(f"使用UPX压缩: {upx_dir}")
+                    else:
+                        print(f"警告: UPX目录不存在 {upx_dir}")
+                else:
+                    print("不使用UPX压缩")
 
             # 添加单文件打包选项
             if onefile == 0: