.

Author: CBenoit

.github/workflows/package.yml

@@ -566,66 +566,48 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.project }}-${{ matrix.os }}
-          path: ${{ runner.temp }}/${{ matrix.project }}
+          path: ${{ runner.temp }}/${{ matrix.project }}-signed
           if-no-files-found: error
           retention-days: 1
 
   devolutions-gateway-merge:
-    name: Merge gateway artifacts
+    name: Devolutions Gateway merge artifacts
     runs-on: ubuntu-latest
-    needs: [preflight, codesign]
+    needs: [codesign]
 
     steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: devolutions-gateway-*
-          merge-multiple: true
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
         with:
-          path: ${{ github.workspace }}/**/*
-          name: devolutions-gateway
-          overwrite: true
+          name: devolutions-gateway-signed
+          pattern: devolutions-gateway-signed-*
+          delete-merged: false
 
   devolutions-agent-merge:
-    name: Merge agent artifacts
+    name: Devolutions Agent merge artifacts
     runs-on: ubuntu-latest
-    needs: [preflight, codesign]
+    needs: [codesign]
 
     steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
         with:
-          pattern: devolutions-agent-*
-          merge-multiple: true
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          path: ${{ github.workspace }}/**/*
-          name: devolutions-agent
-          overwrite: true
+          name: devolutions-agent-signed
+          pattern: devolutions-agent-signed-*
+          delete-merged: false
 
   jetsocat-merge:
-    name: Merge jetsocat artifacts
+    name: Jetsocat merge artifacts
     runs-on: ubuntu-latest
-    needs: [preflight, codesign]
+    needs: [codesign]
 
     steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
         with:
-          pattern: jetsocat-*
-          merge-multiple: true
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          path: ${{ github.workspace }}/**/*
-          name: jetsocat
-          overwrite: true
+          name: jetsocat-signed
+          pattern: jetsocat-signed-*
+          delete-merged: false
 
   web-app:
     name: Web App