1,554
edits
Difference between revisions of "HOWTO-Release"
Jump to navigation
Jump to search
→Branching for major release: -- bumped versions for easier copy/pasting
(→Branching for major release: -- update with buildbot and communication) |
(→Branching for major release: -- bumped versions for easier copy/pasting) |
||
| Line 12: | Line 12: | ||
=== Branching for major release === | === Branching for major release === | ||
* Create a branch for the | * Create a branch for the 2.2.x releases from master, named branch-2-2 | ||
** <code>git checkout -b branch- | ** <code>git checkout -b branch-2-2 master</code> | ||
* Increase version on branch- | * Increase version on branch-2-2 to 2.2.0pre (using <code>devtools/update-version.pl</code>; see below), and commit | ||
** <code>devtools/update-version.pl | ** <code>devtools/update-version.pl 2 2 0 pre</code> | ||
** <code>git commit -m "RELEASE: This is | ** <code>git commit -m "RELEASE: This is 2.2.0pre" -a</code> | ||
* Create annotated tag desc/ | * Create annotated tag desc/2.2.0pre on that commit and push | ||
** <code>git tag -m "Mark | ** <code>git tag -m "Mark 2.2.0pre" desc/2.2.0pre</code> | ||
** <code>git push origin tag desc/ | ** <code>git push origin tag desc/2.2.0pre branch-2-2:branch-2-2</code> | ||
* Increase version on master to | * Increase version on master to 2.3.0git, and commit | ||
** <code>git checkout master</code> | ** <code>git checkout master</code> | ||
** <code>devtools/update-version.pl | ** <code>devtools/update-version.pl 2 3 0 git</code> | ||
** <code>git commit -m "RELEASE: This is | ** <code>git commit -m "RELEASE: This is 2.3.0git" -a</code> | ||
* Create annotated tag desc/ | * Create annotated tag desc/2.3.0git on that commit and push | ||
** <code>git tag -m "Mark | ** <code>git tag -m "Mark 2.3.0git" desc/2.3.0git</code> | ||
** <code>git push origin tag desc/ | ** <code>git push origin tag desc/2.3.0git master</code> | ||
* Update buildbot | * Update buildbot | ||
** Set <code>scumm_branch_stable = "branch- | ** Set <code>scumm_branch_stable = "branch-2-2"</code> in master.cfg around [https://github.com/scummvm/scummvm-sites/blob/buildbot/config/master.cfg#L25 line 25]. | ||
** Restart the buildbot | ** Restart the buildbot as described [[Buildbot#Administration|here]] | ||
* Communication | * Communication | ||
** Update IRC and Discord channel description | ** Update IRC and Discord channel description | ||