Repository navigation
chore: adopt trunk based development on main - #669
Merged
Merged
Conversation
Drop the git-flow model: main is the only long-lived branch, releases are tags on main and hotfixes come from release/X.Y.x branches cut from the released tag. Point CI, badges, docs links and the contributing guide at main and remove the Sonar-era 'git fetch origin develop' step. Signed-off-by: Fernando Macedo <fgmacedo@gmail.com>
|
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
1 participant
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.
What
Drops git-flow.
mainbecomes the only long-lived branch, releases are tags onmain, hotfixes come fromrelease/X.Y.xbranches cut from the released tag with fixes cherry-picked frommain. Thelatesttag keeps moving on every release.Changes
Python checksandpagesrun onmain(plusrelease/**pushes for hotfix CI); the Sonar-eragit fetch origin developstep is removed fromPython checksandrelease.main; commits-since badge measures from thelatestrelease and linkscompare/latest...main.docs/conf.py: GitHub links usemain.docs/contributing.md: contributor branches start frommain, release process rewritten without git-flow, new "Hotfix releases" section.docs/installation.md: clone URL useshttps://(GitHub no longer servesgit://).AGENTS.md: git workflow section.After merge (repo settings, done manually)
maintodevelop.main; retarget feat: add event deferral to states #664.github-pagesenvironment: allowmainandv*tags, dropdevelop.develop.latestfollowmain.