From bbcfdf94e7ee08e96e189586f6a086d4bcf1061a Mon Sep 17 00:00:00 2001
From: NianBroken <suinian666@gmail.com>
Date: Tue, 13 Feb 2024 17:57:10 +0800
Subject: [PATCH] Update

---
 .github/workflows/main.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9699aac..c756c86 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -61,14 +61,28 @@ jobs:
             rsync -av --include="*/" --include="*$EXT" --exclude="*" ./ backup/
           done
 
-      # 将上游main分支的更改强制推送到当前main分支
+      # 检查是否需要更新 main.yml 文件
+      - name: Check main.yml file consistency
+        run: |
+          if ! cmp -s .github/workflows/main.yml <(git show upstream/main:.github/workflows/main.yml); then
+            echo "main.yml file is inconsistent"
+          fi
+
+      # 排除上游分支的 .github/workflows/main.yml 文件，以避免修改当前分支的该文件
+      - name: Exclude main.yml file from upstream changes
+        run: |
+          git reset HEAD .github/workflows/main.yml
+          git checkout -- .github/workflows/main.yml
+
+      # 将上游main分支的更改强制推送到当前main分支，除了 .github/workflows/main.yml 文件以外的文件
       - name: Force push changes from upstream to current main branch
         run: |
-          git restore --staged .github/workflows/main.yml
           git checkout main
           git reset --hard upstream/main
+          git checkout HEAD .github/workflows/main.yml  # 恢复当前分支的 .github/workflows/main.yml 文件
           git push origin main --force
 
+
       # 从备份目录将指定后缀文件还原到当前目录及子目录中，然后删除备份目录
       - name: Restore local files with specified extensions and delete backup
         run: |