biss/ZFScoresCheck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
NianBroken
2024-02-13 17:20:24 +08:00 Unverified
parent 0f48d57ad1
commit 6393871055
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/main.yml
+8 -4
View File
@@ -66,16 +66,20 @@ jobs:
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 "main.yml file is inconsistent" echo "main.yml file is inconsistent"
exit 1 touch exclude_main_file_flag
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 -rf .github/workflows/main.yml if [ -f exclude_main_file_flag ]; then
git commit -m "Exclude main.yml file from upstream changes" || true git reset HEAD .github/workflows/main.yml
git checkout -- .github/workflows/main.yml
rm exclude_main_file_flag
fi
git commit -m "Update from GitHub Actions" || true
git push origin main --force git push origin main --force
# 从备份目录将指定后缀文件还原到当前目录及子目录中，然后删除备份目录 # 从备份目录将指定后缀文件还原到当前目录及子目录中，然后删除备份目录