Work on attaching artifacts to release

flokuep · Apr 24, 2024 · 07717c8 · 07717c8
1 parent e9722a6
commit 07717c8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
@@ -33,18 +33,27 @@ jobs:
       matrix:
         build:
           - label: "Windows_x86"
-            url: ${{needs.build-windows.outputs.x86}}
+            artifact-name: ${{needs.build-windows.outputs.x86}}
           - label: "Windows_x64"
-            url: ${{needs.build-windows.outputs.x64}}
+            artifact-name: ${{needs.build-windows.outputs.x64}}
 
     runs-on: ubuntu-latest
     steps:
     - name: Download artifact
-      run: "wget --header='Authorization: token ${GITHUB_TOKEN}' ${{ matrix.build.url }}  -O 'Vocaluxe_Nightly_${{ matrix.build.label}}.zip'"
+      id: download-artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: ${{ matrix.build.artifact-name }}
+
+    - name: Zip files
+      run: |
+        cd ${{ steps.download-artifact.outputs.download-path }}
+        7z a '../${{ matrix.build.artifact-name }}.zip'
+
     - name: Attach to release
       uses: softprops/action-gh-release@v2
       with:
-        files: Vocaluxe_Nightly_${{ matrix.build.label}}.zip
+        files: ${{ matrix.build.artifact-name }}.zip
         tag: Nightly
 
 
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -18,7 +18,8 @@ jobs:
          runs-on: windows-latest  # For a list of available runner types, refer to
                              # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
          env:
-            Solution_Name: Vocaluxe.sln                               # Replace with your solution name, i.e. MyWpfApp.sln.
+            Solution_Name: Vocaluxe.sln
+            Artifact_Name: Vocaluxe_Nightly_${{ matrix.platform }}
 
          outputs:
             x86: ${{ steps.create-output.outputs.x86 }}
@@ -58,9 +59,9 @@ jobs:
            id: upload-artifact
            uses: actions/upload-artifact@v4
            with:
-             name: Vocaluxe_Nightly_${{ matrix.platform }}
+             name: ${{ env.Artifact_Name }}
              path: Output
 
          - name: Create output
            id: create-output
-           run: echo "${{ matrix.platform }}=${{ steps.upload-artifact.outputs.artifact-url}}" >> $ENV:GITHUB_OUTPUT
+           run: echo "${{ matrix.platform }}=${{ env.Artifact_Name }}" >> $ENV:GITHUB_OUTPUT