Ensure all releases are merged back into master
parent
e1a2fb6593
commit
f4a82a66f3
|
@ -12,7 +12,9 @@ Releases can only be created by [core developers](https://github.com/orgs/dolphi
|
|||
2. Create a new branch: `git checkout -b <branch name> <base commit or tag>`
|
||||
* If creating a major release, name the branch `release-prep-YYMM` and base it on the `master` branch.
|
||||
* If creating a hotfix release, name the branch `release-prep-YYMMp` and base it on the tag of the last release.
|
||||
3. Cherry pick any necessary commits.
|
||||
3. Add any necessary commits.
|
||||
* If creating a major release and the previous release was a hotfix, merge the hotfix branch into the new release branch. The tree should generally be the same here as before the merge with the exception of `CMake/ScmRevGen.cmake`.
|
||||
* If creating a hotfix release, cherry-pick the changes from `master`.
|
||||
4. Update the version constants in `CMake/ScmRevGen.cmake`, and commit the result.
|
||||
* Set `DOLPHIN_VERSION_MAJOR` to `YYMM`.
|
||||
* Set `DOLPHIN_VERSION_MINOR` to the patch number. If creating a hotfix release, use the number corresponding to the patch letter (for example, `a` is `1`, `b` is `2`, etc). Otherwise, set to `0`.
|
||||
|
|
Loading…
Reference in New Issue