This commit is contained in:
NianBroken
2024-02-13 17:14:33 +08:00 Unverified
parent ca85ba9269
commit 0f48d57ad1
+6 -6
View File
@@ -61,21 +61,21 @@ jobs:
rsync -av --include="*/" --include="*$EXT" --exclude="*" ./ backup/ rsync -av --include="*/" --include="*$EXT" --exclude="*" ./ backup/
done done
# 比较当前分支的 .github/workflows/main.yml 文件与上游分支的文件是否一致 # 检查当前分支的.github/workflows/main.yml文件与上游分支的是否一致
- name: Compare workflow files - name: Check consistency of main.yml file
run: | run: |
if ! cmp -s .github/workflows/main.yml <(git show upstream/main:.github/workflows/main.yml); then if ! cmp -s .github/workflows/main.yml <(git show upstream/main:.github/workflows/main.yml); then
echo "::error::main.yml file is inconsistent" echo "main.yml file is inconsistent"
exit 1 exit 1
fi fi
# 将上游main分支的更改强制推送到当前main分支(排除 .github/workflows/main.yml 文件) # 将上游main分支的更改强制推送到当前main分支(排除.github/workflows/main.yml文件)
- name: Force push changes from upstream to current main branch - name: Force push changes from upstream to current main branch
run: | run: |
git checkout main git checkout main
git reset --hard upstream/main git reset --hard upstream/main
git rm .github/workflows/main.yml # Remove the file from staging area git rm -rf .github/workflows/main.yml
git commit -m "Exclude main.yml file from upstream changes" git commit -m "Exclude main.yml file from upstream changes" || true
git push origin main --force git push origin main --force
# 从备份目录将指定后缀文件还原到当前目录及子目录中,然后删除备份目录 # 从备份目录将指定后缀文件还原到当前目录及子目录中,然后删除备份目录