How to configure GitVersion for Release Flow?
I am trying to configure GitVersion to work with the Release Flow branching strategy.
Basically, I have a mainline Master branch, Release, Feature and Fix branches. The Feature and Fix branches are created from the Master branch and merged back into Master via a pull request. At the end of a sprint, I create a Release branch from Master, which will last till the end of the next sprint, when a new Release branch will be created. The Release branches are not merged back into master. They can even be deleted after a new Release branch has been created. If there's a hotfix needed, it will be developed on a Fix branch created from and merged back into master and then cherry-picked into the current Release branch. I only use git tags for major releases.
Going back to GitVersion, I want to configure it so that the minor version number will increase when I create a new release branch and the patch number to increase when there's a new commit on the release branch (cherry-picked from a Fix branch).
Has anyone done that already and can help me?
We use flow pretty similar to this one (actually based on it). We do hotfixes right on release branches and we also create pre-release branches before release ones (convenient to have separate channels in octopus-deploy).
After a bit struggle, i ended up with my own PowerShell script. The script is simple and works super fast (near 1 second, unlike GitVersion, which could work 5-15 minutes on our huge repos with big amount of branches). Now, the result looks like that:
It mostly designed to usage with TeamCity, but i think you could easily change it to feet you needs. You can see detailed description of calculation algorithm inside script comments. It also briefly explained on this diagram:
Caveat: In future/topic branches, unlike GitVersion, script uses always growing build counter from teamcity, instead of commits counter. I had to do it, when i found out than our colleges use force pushes(some "clean history" politics), and i can't rely on commits history.
- Rename file for all commits in a Git repository
- git pull and resolve conflicts
- How to substitute text from files in git history?
- Define git alias with the same name to shadow original command
- Specify extras_require with pip install -e
- How do I rebase my PR without adding commits to it?
- Merge git repo into branch of another repo
- How to correct `git` reporting `detected dubious ownership in repository` without adding `safe.directory` when using WSL?
- Trouble setting up git with my GitHub Account error: could not lock config file
- In a Git repository, how to properly rename a directory?
- Git submodule push
- send-pack: unexpected disconnect while reading sideband packet when pushing to local git server
- Gerrit: configure similarity index threshold (renamed file)
- Git double revert : How to keep original author?
- Gitignore not working
- git submodule deinit not working as expected after submodule url change
- How can I find/identify large commits in Git history?
- How to fix : failed to push some refs to gitlab?
- Gitlab: webhook event on create branch
- Using "x AND y" instead of "x OR y" when using --grep twice in git-log
- Issues with commit message when pre-commit hook changes files
- Unstaged changes left after git reset --hard
- How to clone only a folder from a git submodule?
- How do I checkout a branch ignoring all local changes?
- Include only tracked files with npm publish
- Prevent Pull Request builds from triggering Continuous deployment trigger Azure DevOps Server
- Heroku/Git: protocol error: bad line length character: erro
- Add all files to a commit except a single file?
- Git Bash is extremely slow on Windows 7 x64
- How to delete a git working tree branch when its working directory has been removed?