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.
- How to list all tags along with the full message in git?
- How to solve "Unable to find git in your PATH" on Flutter?
- Using GIT_SSH_COMMAND to switch SSH key based on current working directory
- Break a previous commit into multiple commits
- Should I ignore the .idea folder when using PyCharm with Git?
- git clone only clone folder
- Remove a git commit between two commits
- git - gpg onto mac osx: error: gpg failed to sign the data
- Visual studio 2019 "Error encountered while pushing to the remote repository: Failed to push to the remote repository..."
- Why is `git submodules add` storing the GIT information in the parent .git?
- Can't get exp4j to install
- Gitlab runner 13.1.1 checks out a commit and not my branch
- Make branch name dynamic on Jenkins build pipeline from SCM
- Keep Git Branch Name Untruncated in Shell using p10k (Oh My Zsh theme)
- Track all remote git branches as local branches
- git pull origin master returns fatal: invalid refspec
- How to cancel previous runs in the PR when you push new commits(update the current) in github-actions
- Sonarqube: Missing blame information for the following files
- How to remove files that are listed in the .gitignore but still on the repository?
- How to tell git to use the correct identity (name and email) for a given project?
- git lost a commit after stash and merge
- Partly cherry-picking a commit with Git
- Is there any GUI tools for "git add -p"?
- Gitea - How to change the default branch name back to "master"
- Enforce git tags with specific formatting
- Is it safe to delete or remerge a Gitflow feature branch after it was previously merged into the develop branch?
- How to enter command with password for git pull?
- Why vscode don't recognize my .git folder?
- How do I undo the most recent local commits in Git?
- How do I resolve merge conflicts in a Git repository?