Repository navigation
ci: adopt dev trunk with promotion-only main branch - #5
Merged
Merged
Conversation
dev becomes the default branch and integration trunk; main becomes the release branch that only receives promotion PRs from dev and carries the version tags. - ci: run test on pushes to dev and main, keep the expensive container builds on PRs and main only - release: refuse to publish when the pushed tag is not an ancestor of main, so an accidental tag on a dev commit cannot ship - docs: add docs/branching.md and rewrite docs/releasing.md around the promote-then-tag flow
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
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.
把仓库从「单 main」正式切换为「dev 主干 + main 发布账本」。
改动
ci.yml:触发分支改为[dev, main](默认分支切到 dev 后,push dev 原来是没有 CI 的);containersjob 加了条件,只在 PR 和main上跑,dev的日常 push 只跑test。release.yml:verifyjob 增加 ancestry 守卫,tag 不是main祖先时直接失败,防止在 dev 提交上误打 tag 触发发布。docs/branching.md(新增):分支职责、日常开发、晋升、hotfix 回合并规则。docs/releasing.md:重写为「先晋升 dev→main,再在 merge commit 上打 tag」。README.md:文档导航加「分支模型」。说明
main会因为晋升产生 merge commit,因此分支保护不要开 "Require linear history"。