1,190
edits
Difference between revisions of "HOWTO-Release"
Jump to navigation
Jump to search
→Branching for 1.7.x
Rootfather (talk | contribs) m (→Binaries) |
Strangerke (talk | contribs) |
||
| Line 9: | Line 9: | ||
* Update the lists of files below, adding new engine data files and such | * Update the lists of files below, adding new engine data files and such | ||
=== Branching for | === Branching for major release === | ||
For the example, we use v1.7. Don't forget to adapt to the adequate version. | |||
* Create a branch for the 1.7.x releases from master, named branch-1-7 | * Create a branch for the 1.7.x releases from master, named branch-1-7 | ||
** <code>git checkout -b branch-1-7 master</code> | ** <code>git checkout -b branch-1-7 master</code> | ||
| Line 18: | Line 19: | ||
** <code>git tag -m "Mark 1.7.0pre" desc/1.7.0pre</code> | ** <code>git tag -m "Mark 1.7.0pre" desc/1.7.0pre</code> | ||
** <code>git push origin tag desc/1.7.0pre branch-1-7:branch-1-7</code> | ** <code>git push origin tag desc/1.7.0pre branch-1-7:branch-1-7</code> | ||
* Increase version on master to 1. | * Increase version on master to 1.8.0git, and commit | ||
** <code>git checkout master</code> | ** <code>git checkout master</code> | ||
** <code>devtools/update-version.pl 1 | ** <code>devtools/update-version.pl 1 8 0 git</code> | ||
** <code>git commit -m "RELEASE: This is 1. | ** <code>git commit -m "RELEASE: This is 1.8.0git" -a</code> | ||
* Create annotated tag desc/1. | * Create annotated tag desc/1.8.0git on that commit and push | ||
** <code>git tag -m "Mark 1. | ** <code>git tag -m "Mark 1.8.0git" desc/1.8.0git</code> | ||
** <code>git push origin tag desc/1. | ** <code>git push origin tag desc/1.8.0git master</code> | ||
=== Testing === | === Testing === | ||