移动上传步骤位置

Update packer.yml

Update packer.yml

Update packer.yml

try this

Update packer.yml

Revert "fix?"

This reverts commit 164a4be.

fix?

移动上传步骤位置

Author: 502y

.github/workflows/packer.yml

@@ -153,57 +153,79 @@ jobs:
             ${{ matrix.version }}.md5
         if: steps.check-changes.outputs.changed == 'true' || github.event_name == 'workflow_dispatch'
 
-      - name: Set asset name
-        run: |
-          $version_tag = "${{ matrix.version }}"
-          # 如果版本是 1.12.2，则文件名不带版本号后缀
-          if ($version_tag -eq '1.12.2') {
-            $asset_name = "Minecraft-Mod-Language-Modpack.zip"
-          } else {
-            # 否则，转换短横线和版本号
-            $formatted_version = $version_tag -replace '\.', '-'
-            $formatted_version = $formatted_version -replace 'fabric', 'Fabric'
-            $asset_name = "Minecraft-Mod-Language-Modpack-$formatted_version.zip"
-          }
-          echo "ASSET_NAME=$asset_name" >> $env:GITHUB_ENV
-
-      # Upload release asset: https://github.com/actions/upload-release-asset
-      - name: Update release asset for ${{ matrix.version }} (ZIP)
-        id: upload-release-asset-zip
-        if: steps.check-changes.outputs.changed == 'true' ||  github.event_name == 'workflow_dispatch'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.initialize-release.outputs.upload-url }}
-          asset_path: Minecraft-Mod-Language-Modpack-${{ matrix.version }}.zip
-          asset_name: ${{ env.ASSET_NAME }}
-          asset_content_type: application/zip
-
-      # 新增步骤：上传 MD5 文件
-      - name: Update release asset for ${{ matrix.version }} (MD5)
-        id: upload-release-asset-md5
-        if: steps.check-changes.outputs.changed == 'true' || github.event_name == 'workflow_dispatch'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.initialize-release.outputs.upload-url }}
-          asset_path: ${{ matrix.version }}.md5
-          asset_name: ${{ matrix.version }}.md5
-          asset_content_type: text/plain
-
       - name: Collect updated versions
         id: collect-updated
         run: |
           if [ "${{ steps.check-changes.outputs.changed }}" == "true" ] || [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
             # Replace all periods and hyphens with underscores
+            # 将.转换为_，适配变量名
             output_key=$(echo "${{ matrix.version }}" | sed 's/[\.-]/_/g')
             echo "version_$output_key=${{ matrix.version }}" >> $GITHUB_OUTPUT
           fi
         shell: bash
         continue-on-error: true
 
+  upload-release-assets:
+    name: Upload Release Assets
+    needs: [ pack, initialize-release ]
+    runs-on: windows-latest
+    steps:
+      - name: Download all Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts/
+
+      - name: Upload Release Assets
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Get the upload URL from the previous job
+          $upload_url = "${{ needs.initialize-release.outputs.upload-url }}"
+          
+          # Clean up the URL by removing the template part {?name,label}
+          $clean_upload_url = $upload_url.Split('{')[0]
+          
+          # Iterate through downloaded artifact directories
+          Get-ChildItem -Path "artifacts" -Directory | ForEach-Object {
+              $artifact_dir_name = $_.Name
+              $version_tag = ($artifact_dir_name -split '-Modpack-')[1]
+          
+              # Generate the correct asset names
+              if ($version_tag -eq '1.12.2') {
+                $zip_asset_name = "Minecraft-Mod-Language-Modpack.zip"
+              } else {
+                $formatted_version = $version_tag -replace '\.', '-'
+                $formatted_version = $formatted_version -replace 'fabric', 'Fabric'
+                $zip_asset_name = "Minecraft-Mod-Language-Modpack-$formatted_version.zip"
+              }
+          
+              # Build file paths using sub-expression operator
+              $zip_path = "$(Join-Path -Path $_.FullName -ChildPath ($artifact_dir_name + '.zip'))"
+              $md5_path = "$(Join-Path -Path $_.FullName -ChildPath ($version_tag + '.md5'))"
+          
+              # Build the full URL using the format operator -f
+              $zip_upload_url = "{0}?name={1}" -f $clean_upload_url, $zip_asset_name
+              $md5_upload_url = "{0}?name={1}" -f $clean_upload_url, ($version_tag + ".md5")
+          
+              # Upload ZIP file
+              echo "Uploading ZIP: $zip_path as $zip_asset_name"
+              curl.exe -X POST `
+                -H "Authorization: token $env:GITHUB_TOKEN" `
+                -H "Content-Type: application/zip" `
+                --data-binary "@$zip_path"  `
+                $zip_upload_url
+          
+              # Upload MD5 file
+              echo "Uploading MD5: $md5_path as $version_tag.md5"
+              $md5_content = Get-Content -Path "$md5_path"
+              curl.exe -X POST `
+                -H "Authorization: token $env:GITHUB_TOKEN" `
+                -H "Content-Type: text/plain" `
+                --data-raw "$md5_content" `
+                $md5_upload_url
+          }
+        shell: pwsh
+
   update-index:
     name: Update Version Index (Optional)
     needs: [pack, initialize-release]