fix(ci): Update upload-artifact with merge step

r2d2rogers · Jan 30, 2024 · 0755b7a · 0755b7a
1 parent 5685074
commit 0755b7a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/.github/workflows/build-user-config.yml b/.github/workflows/build-user-config.yml
@@ -157,7 +157,19 @@ jobs:
           fi
 
       - name: Archive (${{ env.display_name }})
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.archive_name }}
+          name: artifact-${{ env.artifact_name }}
           path: ${{ env.build_dir }}/artifacts
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: build
+    name: Merge Output Artifacts
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: ${{ inputs.archive_name }}
+          pattern: artifact-*
+          delete-merged: true