From 422aad9f03ba9c8b44df5263e33bcbf51e4ffd2c Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Thu, 19 Mar 2026 02:55:48 +0800
Subject: [PATCH 1/2] [Bug Fix] Preserve xcresult bundle structure in CI
 artifacts

Zip the .xcresult bundle before uploading to preserve its macOS
package structure. Bump upload-artifact to v7 with archive: false
to avoid double-zipping.
---
 .github/actions/uitests/action.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/actions/uitests/action.yml b/.github/actions/uitests/action.yml
index 4c5ab4a3a..3c550f129 100644
--- a/.github/actions/uitests/action.yml
+++ b/.github/actions/uitests/action.yml
@@ -66,10 +66,18 @@ runs:
         path: /tmp/uitest-artifacts/
         retention-days: 7
 
+    - name: Zip xcresult bundle
+      if: steps.uitest.outcome == 'failure'
+      shell: bash
+      run: |
+        cd /tmp
+        zip -r -q ${{ inputs.platform }}-uitest.xcresult.zip ${{ inputs.platform }}-uitest.xcresult
+
     - name: Upload xcresult bundle
       if: steps.uitest.outcome == 'failure'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
-        name: ${{ inputs.artifact-name }}-xcresult
-        path: /tmp/${{ inputs.platform }}-uitest.xcresult
+        name: ${{ inputs.artifact-name }}-xcresult.zip
+        path: /tmp/${{ inputs.platform }}-uitest.xcresult.zip
+        archive: false
         retention-days: 7

From 7d8f107bcbfee41533c8a03799f1651b6ce73238 Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Thu, 19 Mar 2026 03:18:19 +0800
Subject: [PATCH 2/2] Rename xcresult bundle to match artifact name before
 zipping

---
 .github/actions/uitests/action.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/actions/uitests/action.yml b/.github/actions/uitests/action.yml
index 3c550f129..2560d1ec1 100644
--- a/.github/actions/uitests/action.yml
+++ b/.github/actions/uitests/action.yml
@@ -71,13 +71,14 @@ runs:
       shell: bash
       run: |
         cd /tmp
-        zip -r -q ${{ inputs.platform }}-uitest.xcresult.zip ${{ inputs.platform }}-uitest.xcresult
+        mv ${{ inputs.platform }}-uitest.xcresult ${{ inputs.artifact-name }}.xcresult
+        zip -r -q ${{ inputs.artifact-name }}.xcresult.zip ${{ inputs.artifact-name }}.xcresult
 
     - name: Upload xcresult bundle
       if: steps.uitest.outcome == 'failure'
       uses: actions/upload-artifact@v7
       with:
-        name: ${{ inputs.artifact-name }}-xcresult.zip
-        path: /tmp/${{ inputs.platform }}-uitest.xcresult.zip
+        name: ${{ inputs.artifact-name }}.xcresult.zip
+        path: /tmp/${{ inputs.artifact-name }}.xcresult.zip
         archive: false
         retention-days: 7