From d7f69308a496f94f887572d952e6eb8fa30fa4ec Mon Sep 17 00:00:00 2001
From: Jacques Gagnon <darthcloud@gmail.com>
Date: Sat, 14 Sep 2024 00:14:53 -0400
Subject: [PATCH] test

---
 .github/workflows/build.yml | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1140bcfb..ac0f95c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,6 +27,8 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/darthcloud/idf-blueretro:v5.3.0_2024-02-18
+    outputs:
+      br_version: ${{ env.br_version }}
 
     steps:
     - name: Checkout repo
@@ -49,12 +51,34 @@ jobs:
         mkdir ota
         mv ota_data_initial.bin ota/
     - name: Upload artifact
-      uses: darthcloud/upload-artifact@v4
+      uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.br_version }}_${{ matrix.hw_version }}
+        name: ${{ matrix.hw_version }}_${{ matrix.br_config }}
         path: |
           build/partition_table/partition-table.bin
           build/bootloader/bootloader.bin
           build/ota/ota_data_initial.bin
           build/BlueRetro*.bin
         if-no-files-found: error
+
+  package:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          path: build
+          merge-multiple: true
+      - name: Display structure of downloaded files
+        run: |
+          ls -R build
+          echo ${{ needs.build.outputs.br_version }}
+
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: ${{ needs.build.outputs.br_version }}_hw1
+          pattern: hw1*
+          delete-merged: true