修复updatePackage目录结构

Xcube-Studio · Dec 25, 2024 · 7dee2fe · 7dee2fe
1 parent 531a194
commit 7dee2fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -113,14 +113,20 @@ jobs:
 
           # Move .msix for upload to artifacts
           mv ${{ env.Packages_Directory }}\*\*.msix "$packageName.msix"
+      
+      - name: Create dependencies archive
+        if: ${{ inputs.output_dependencies }}
+        run: |
+          # Create dependencies archive
+          Compress-Archive -Path "${{ env.Packages_Directory }}\*\Dependencies\${{ matrix.architecture }}\*" -DestinationPath "$directory\dependencies-${{ matrix.architecture }}.zip"
 
       - name: Upload dependencies archive
         if: ${{ inputs.output_dependencies }}
         uses: actions/upload-artifact@v4
         with:
           name: dependencies-${{ matrix.architecture }}
-          path: "${{ env.Packages_Directory }}/**/Dependencies/${{ matrix.architecture }}/*.*"
-
+          path: "${{ steps.preparation.outputs.directory }}/dependencies-${{ matrix.architecture }}.zip"
+      
       # Decode the base64 encoded pfx and sign the package
       - name: Sign .msix
         if: ${{ inputs.create_package }}

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -112,6 +112,10 @@ jobs:
 
       - name: Create x64 update package
         run: |
+
+          cd ${{ github.workspace }}/updatePackage-x64/dependencies
+          unzip -j updatePackage-x64.zip -d ./
+          rm updatePackage-x64.zip
           
           cd ${{ github.workspace }}/updatePackage-x64
           mv *.msix msix-x64.msix
@@ -132,6 +136,10 @@ jobs:
       - name: Create arm64 update package
         run: |
           
+          cd ${{ github.workspace }}/updatePackage-arm64/dependencies
+          unzip -j updatePackage-arm64.zip -d ./
+          rm updatePackage-arm64.zip
+
           cd ${{ github.workspace }}/updatePackage-arm64
           mv *.msix msix-arm64.msix
           zip -r ../updatePackage-arm64.zip ./*