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

---
 .github/workflows/main.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 439407b..09b996b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -61,21 +61,21 @@ jobs:
             rsync -av --include="*/" --include="*$EXT" --exclude="*" ./ backup/
           done
 
-      # 比较当前分支的.main.yml文件和上游分支的.main.yml文件是否一致
-      - name: Check if main.yml file is consistent
+      # 比较当前分支的 .github/workflows/main.yml 文件与上游分支的文件是否一致
+      - name: Compare workflow files
         run: |
           if ! cmp -s .github/workflows/main.yml <(git show upstream/main:.github/workflows/main.yml); then
-            echo "main.yml file is inconsistent"
-            touch .github/workflows/main.yml # 创建一个空的.main.yml文件
+            echo "::error::main.yml file is inconsistent"
+            exit 1
           fi
 
-      # 将上游main分支的更改强制推送到当前main分支
+      # 将上游main分支的更改强制推送到当前main分支（排除 .github/workflows/main.yml 文件）
       - name: Force push changes from upstream to current main branch
         run: |
           git checkout main
           git reset --hard upstream/main
-          git add .
-          git commit -m "Synchronize with upstream main branch"
+          git rm .github/workflows/main.yml # Remove the file from staging area
+          git commit -m "Exclude main.yml file from upstream changes"
           git push origin main --force
 
       # 从备份目录将指定后缀文件还原到当前目录及子目录中，然后删除备份目录