Skip to content

ci: set git identity for Sync Main Into Develop #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jubaoliang merged 1 commit into from
Aug 11, 2026
Merged

ci: set git identity for Sync Main Into Develop #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/sync-main-to-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ jobs:
TAG: ${{ github.event.release.tag_name || github.event.workflow_run.head_branch || 'manual' }}
run: |
set -euo pipefail
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
version="${TAG#v}"
sync_branch="chore/sync-develop-after-${version}"
git fetch origin main develop
Expand Down Expand Up @@ -77,7 +79,9 @@ jobs:
git checkout -B "${sync_branch}"
git push -u origin "${sync_branch}" --force
else
git merge --abort
if [ -f .git/MERGE_HEAD ]; then
git merge --abort
fi
echo "Merge conflict — rebuilding develop on main tip."

git diff --name-only origin/main "${saved_develop}" > /tmp/diff_files.txt || true
Expand Down
Loading