Clarify which branch to push fixes to.
parent
e830d2c3aa
commit
501e125779
|
@ -9,7 +9,7 @@ Releases are supposed to be tagged on the "stable" branch. Whenever a major rele
|
||||||
---
|
---
|
||||||
|
|
||||||
1. Merge master into the 'stable' branch such that after merge "stable == master". All following steps refer to that branch.
|
1. Merge master into the 'stable' branch such that after merge "stable == master". All following steps refer to that branch.
|
||||||
2. Push regression fixes, these will be merged into master at the end, but may be merged to master during this process.
|
2. Push regression fixes to the 'stable' branch, these will be merged into master at the end, but may be merged to master during this process.
|
||||||
3. Update `PRODUCT_VERSION` in `Installer/Installer.nsi`. And update the `DOLPHIN_VERSION_MAJOR` and `DOLPHIN_VERSION_MINOR` lines in `CMakeLists.txt`.
|
3. Update `PRODUCT_VERSION` in `Installer/Installer.nsi`. And update the `DOLPHIN_VERSION_MAJOR` and `DOLPHIN_VERSION_MINOR` lines in `CMakeLists.txt`.
|
||||||
4. Create an **annotated** tag named after the version number.
|
4. Create an **annotated** tag named after the version number.
|
||||||
5. Perform a **clean** Windows build of the "Release Win32" and "Release x64" configurations.
|
5. Perform a **clean** Windows build of the "Release Win32" and "Release x64" configurations.
|
||||||
|
|
Loading…
Reference in New Issue