From 30ab56f19066ab0bbcac089b3bb9efc7b8120cf1 Mon Sep 17 00:00:00 2001
From: lirtual <lirtual@qq.com>
Date: Sun, 22 Dec 2024 15:48:18 +0800
Subject: [PATCH] update

---
 .github/workflows/optimize-assets.yml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/optimize-assets.yml b/.github/workflows/optimize-assets.yml
index 735a898a0a1..02e69da5cfa 100644
--- a/.github/workflows/optimize-assets.yml
+++ b/.github/workflows/optimize-assets.yml
@@ -20,6 +20,31 @@ jobs:
         with:
           fetch-depth: 0
       
+      - name: Merge main branch
+        id: merge_main
+        continue-on-error: true
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git fetch origin main
+          if git merge origin/main --no-edit; then
+            echo "merge_status=success" >> $GITHUB_OUTPUT
+          else
+            echo "merge_status=failed" >> $GITHUB_OUTPUT
+            exit 1
+          fi
+      
+      - name: Check merge status
+        if: steps.merge_main.outputs.merge_status == 'failed'
+        run: |
+          echo "合并 main 分支失败，请手动解决冲突"
+          exit 1
+      
+      - name: Push merged changes
+        if: steps.merge_main.outputs.merge_status == 'success'
+        run: |
+          git push
+      
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
@@ -81,7 +106,7 @@ jobs:
           fi
       
       - name: Commit and push if changed
-        if: steps.check_changes.outputs.changes == 'true'
+        if: steps.check_changes.outputs.changes == 'true' && steps.merge_main.outputs.merge_status == 'success'
         run: |
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"