From dd688e7b3f3355c50a269686d77cc39dfeb78a51 Mon Sep 17 00:00:00 2001
From: dxl <64101226@qq.com>
Date: Wed, 2 Apr 2025 13:19:35 +0800
Subject: [PATCH] Fix workflow artifact conflict 409-Error

By: https://github.com/ChameleonUltra/ChameleonUltra/commit/18d725b9c3156f623d1abaeef5e4b34d5becbdbd
---
 .github/workflows/build_client.yml   |  2 +-
 .github/workflows/build_firmware.yml |  2 +-
 .github/workflows/on_push.yml        | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_client.yml b/.github/workflows/build_client.yml
index 973bb21..792b21a 100644
--- a/.github/workflows/build_client.yml
+++ b/.github/workflows/build_client.yml
@@ -70,5 +70,5 @@ jobs:
       - name: Upload release artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-${{ matrix.name }}
           path: client-${{ matrix.name }}.zip
diff --git a/.github/workflows/build_firmware.yml b/.github/workflows/build_firmware.yml
index 8d87fd1..43483e2 100644
--- a/.github/workflows/build_firmware.yml
+++ b/.github/workflows/build_firmware.yml
@@ -88,5 +88,5 @@ jobs:
       - name: Upload release artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-${{ matrix.device_type }}
           path: firmware/objects/*.zip
diff --git a/.github/workflows/on_push.yml b/.github/workflows/on_push.yml
index 08c228e..1f41f3a 100644
--- a/.github/workflows/on_push.yml
+++ b/.github/workflows/on_push.yml
@@ -26,9 +26,10 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
       - name: Download release artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-*
+          merge-multiple: true
           path: release-artifacts
       - name: Upload to dev release
         uses: softprops/action-gh-release@v1
@@ -62,9 +63,10 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
       - name: Download release artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-*
+          merge-multiple: true
           path: release-artifacts
       - name: Upload to tagged release
         uses: softprops/action-gh-release@v1