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

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2fce855..439407b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -61,11 +61,21 @@ jobs:
             rsync -av --include="*/" --include="*$EXT" --exclude="*" ./ backup/
           done
 
+      # 比较当前分支的.main.yml文件和上游分支的.main.yml文件是否一致
+      - name: Check if main.yml file is consistent
+        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文件
+          fi
+
       # 将上游main分支的更改强制推送到当前main分支
       - 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 push origin main --force
 
       # 从备份目录将指定后缀文件还原到当前目录及子目录中，然后删除备份目录