ci: fix remaining artifact upload conflicts

Devolutions · Apr 8, 2024 · a9c43a7 · a9c43a7
1 parent 7338c5f
commit a9c43a7
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/.github/workflows/publish-libraries.yml b/.github/workflows/publish-libraries.yml
@@ -68,11 +68,24 @@ jobs:
       - name: Upload packages
         uses: actions/upload-artifact@v4
         with:
-          name: nupkg
+          name: nupkg-${{matrix.library}}
           path: |
             nuget-packages/*.nupkg
             nuget-packages/*.snupkg
 
+  nuget-merge:
+    name: NuGet merge artifacts
+    runs-on: ubuntu-latest
+    needs: nuget-build
+
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: nupkg
+          pattern: nupkg-*
+          delete-merged: true
+
   npm-build:
     name: NPM package build
     runs-on: ubuntu-20.04
@@ -105,7 +118,7 @@ jobs:
     if: needs.preflight.outputs.dry-run == 'false'
     needs:
       - preflight
-      - nuget-build
+      - nuget-merge
 
     steps:
       - name: Download NuGet packages artifact