From 81e86b3300a6c680193a93f28e04bea8bb2859d4 Mon Sep 17 00:00:00 2001
From: Francois Beutin <francois.beutin@ledger.fr>
Date: Tue, 18 Jun 2024 18:36:48 +0200
Subject: [PATCH] Fix manifest upload

---
 .github/workflows/_get_app_manifest.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/_get_app_manifest.yml b/.github/workflows/_get_app_manifest.yml
index bff32ea..1533fcf 100644
--- a/.github/workflows/_get_app_manifest.yml
+++ b/.github/workflows/_get_app_manifest.yml
@@ -72,6 +72,17 @@ jobs:
       - name: Upload app manifest
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.upload_manifest_artifact_name }}
+          name: ${{ inputs.upload_manifest_artifact_name }}-${{ matrix.device }}
           path: ./manifest_*.json
           if-no-files-found: error
+
+  merge_artifacts:
+    name: Merge build artifacts
+    needs: get_app_manifest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/upload-artifact/merge@v4
+        with:
+          name: ${{ inputs.upload_manifest_artifact_name }}
+          pattern: ${{ inputs.upload_manifest_artifact_name }}-*
+          delete-merged: true