ci: set git identity for Sync Main Into Develop - #238
Merged
Conversation
GitHub-hosted runners have no committer name/email, so merge commits failed before conflicts could be handled. Abort only when MERGE_HEAD exists. Co-authored-by: Cursor <cursoragent@cursor.com>
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
main上的 workflow 定义执行（Release /workflow_dispatch --ref main）。user.name/user.email，merge commit 会在处理冲突前失败。github-actions[bot]身份；仅在存在MERGE_HEAD时merge --abort。develop已通过 #237 带上同一修复。合入本 PR 后需再把新的maintip 同步回develop，以保持祖先关系。Test plan
make all+ dashboard build）通过workflow_dispatch不再出现 empty identmaintip 同步回developMade with Cursor