admin/POC
1
0
Fork 0
mirror of https://github.com/eeeeeeeeee-code/POC.git synced 2025-05-05 10:17:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update sync.yml

Browse Source
This commit is contained in:
G4v1n 2025-03-10 10:46:09 +08:00 committed by GitHub
parent be81a97bf2
commit 68d0a0b5c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/sync.yml vendored
View File

@ -1,4 +1,4 @@
name: Incremental Sync Upstream Repository (Master Branch)
name: Incremental Sync Upstream Repository (Main Branch)
on:
schedule:
@ -12,7 +12,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v2
with:
path: repo # 确保仓库检出到 repo 目录
path: repo
- name: Configure Git User
run: |
@ -43,8 +43,8 @@ jobs:
# 创建临时分支用于合并
git checkout -b temp-merge-branch
# 合并上游仓库的 master 分支
git merge upstream/master --no-commit --no-ff --allow-unrelated-histories
# 合并上游仓库的 main 分支（如果上游仓库使用 main 而非 master）
git merge upstream/main --no-commit --no-ff --allow-unrelated-histories
# 检查是否有变更
if git diff --cached --quiet; then
@ -54,7 +54,7 @@ jobs:
exit 0
else
# 提交合并并推送
git commit -m "Incr: Sync with upstream master branch"
git commit -m "Incr: Sync with upstream main branch"
git push origin main # 或 git push origin master
git branch -D temp-merge-branch
fi