From c92862a5f919f94f073e3403312e6a210b417113 Mon Sep 17 00:00:00 2001
From: Supper Thomas <78900636@qq.com>
Date: Sun, 23 Mar 2025 13:23:43 +0800
Subject: [PATCH 1/6] =?UTF-8?q?[action/cd]=20=E6=95=B4=E5=90=88=E6=89=80?=
 =?UTF-8?q?=E6=9C=89output=E5=88=B0=E4=B8=80=E4=B8=AA=E5=8C=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/bsp_buildings.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml
index 81dddf5a80d..25aca69dd69 100644
--- a/.github/workflows/bsp_buildings.yml
+++ b/.github/workflows/bsp_buildings.yml
@@ -559,3 +559,21 @@ jobs:
           curl -X POST -H "Authorization: token ${{ secrets.RTTHREAD_GITHUB_TOKEN }}" \
           -d '{"body":"@${{ github.actor }}, Thank you for your contribution, but there was an error with the action. Could you please help check the BSP compilation issue? Thank you."}' \
           "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
+  # 整合所有的output为一个文件夹 
+  collect-artifacts:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      #这里会下载所有产物
+      - name: Download all artifacts
+        uses: actions/download-artifact@main
+        with:
+          path: output/
+          merge-multiple: true
+      - run: ls -R output/
+
+      - name: Upload combined output as artifact
+        uses: actions/upload-artifact@main
+        with:
+          name: 00_all_bsp_output
+          path: output/

From 651a59c2e0ba0b45cb7624e37fd09b14e74acbc2 Mon Sep 17 00:00:00 2001
From: Supper Thomas <78900636@qq.com>
Date: Sun, 23 Mar 2025 13:26:20 +0800
Subject: [PATCH 2/6] Update bsp_buildings.yml

---
 .github/workflows/bsp_buildings.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml
index 25aca69dd69..525bbfb84bd 100644
--- a/.github/workflows/bsp_buildings.yml
+++ b/.github/workflows/bsp_buildings.yml
@@ -563,6 +563,7 @@ jobs:
   collect-artifacts:
     needs: build
     runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request' #排除Pull request
     steps:
       #这里会下载所有产物
       - name: Download all artifacts

From 8a7bd64e9d5da528dec240a0d23c9a5f9f49b0c1 Mon Sep 17 00:00:00 2001
From: Supper Thomas <78900636@qq.com>
Date: Sun, 23 Mar 2025 21:27:37 +0800
Subject: [PATCH 3/6] Update bsp_buildings.yml

---
 .github/workflows/bsp_buildings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml
index 525bbfb84bd..2538cc8d543 100644
--- a/.github/workflows/bsp_buildings.yml
+++ b/.github/workflows/bsp_buildings.yml
@@ -576,5 +576,5 @@ jobs:
       - name: Upload combined output as artifact
         uses: actions/upload-artifact@main
         with:
-          name: 00_all_bsp_output
+          name: 00_all_bsp_output_${{ github.sha }}
           path: output/

From d0127b4d19cdca65da59ab20745daeea8fb95657 Mon Sep 17 00:00:00 2001
From: Supper Thomas <78900636@qq.com>
Date: Sun, 23 Mar 2025 21:30:25 +0800
Subject: [PATCH 4/6] Update bsp_buildings.yml

---
 .github/workflows/bsp_buildings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml
index 2538cc8d543..78b4d42520d 100644
--- a/.github/workflows/bsp_buildings.yml
+++ b/.github/workflows/bsp_buildings.yml
@@ -576,5 +576,5 @@ jobs:
       - name: Upload combined output as artifact
         uses: actions/upload-artifact@main
         with:
-          name: 00_all_bsp_output_${{ github.sha }}
+          name: 00_all_bsp_output_${{ substr(github.sha, 0, 7) }}  # 取hash值的前7位
           path: output/

From 07ba9a5de9e145ee48f6fd45a85710b3d30c8d39 Mon Sep 17 00:00:00 2001
From: Supper Thomas <78900636@qq.com>
Date: Sun, 23 Mar 2025 21:33:39 +0800
Subject: [PATCH 5/6] Update bsp_buildings.yml

---
 .github/workflows/bsp_buildings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml
index 78b4d42520d..07e87397cf9 100644
--- a/.github/workflows/bsp_buildings.yml
+++ b/.github/workflows/bsp_buildings.yml
@@ -576,5 +576,5 @@ jobs:
       - name: Upload combined output as artifact
         uses: actions/upload-artifact@main
         with:
-          name: 00_all_bsp_output_${{ substr(github.sha, 0, 7) }}  # 取hash值的前7位
+          name: 00_all_bsp_output_${{ github.sha.slice(0, 7) }}  # 取hash值的前7位
           path: output/

From c95efca675b96c3838d860d684e4e95339b272eb Mon Sep 17 00:00:00 2001
From: Supper Thomas <78900636@qq.com>
Date: Sun, 23 Mar 2025 21:36:09 +0800
Subject: [PATCH 6/6] Update bsp_buildings.yml

---
 .github/workflows/bsp_buildings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml
index 07e87397cf9..150bd175b99 100644
--- a/.github/workflows/bsp_buildings.yml
+++ b/.github/workflows/bsp_buildings.yml
@@ -576,5 +576,5 @@ jobs:
       - name: Upload combined output as artifact
         uses: actions/upload-artifact@main
         with:
-          name: 00_all_bsp_output_${{ github.sha.slice(0, 7) }}  # 取hash值的前7位
+          name: 00_all_bsp_output_${{ github.sha }}  
           path: output/