329
edits
Difference between revisions of "HOWTO-Release"
Jump to navigation
Jump to search
→Preparing the source
(→Branching for major release: -- update with buildbot and communication) |
Rootfather (talk | contribs) |
||
| (5 intermediate revisions by 2 users not shown) | |||
| 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 | ||
| Line 51: | Line 51: | ||
** dists/scummvm.rc | ** dists/scummvm.rc | ||
* Review the following documentation files for version and copyright year updates: | * Review the following documentation files for version and copyright year updates: | ||
** README | ** README(.md) | ||
** NEWS | ** NEWS(.md) | ||
** COPYRIGHT | ** COPYRIGHT | ||
* Review the following port specific files for version updates: | * Review the following port specific files for version updates: | ||
| Line 93: | Line 93: | ||
*** COPYING.FREEFONT | *** COPYING.FREEFONT | ||
*** COPYING.LGPL | *** COPYING.LGPL | ||
*** COPYING.OFL | |||
*** COPYRIGHT | *** COPYRIGHT | ||
*** NEWS | *** NEWS(.md) | ||
*** README (generic ScummVM one) | *** README(.md) (generic ScummVM one) | ||
*** localized NEWS and README files (from doc/) (optional) | *** localized NEWS and README files (from doc/) (optional) | ||
*** scummmodern.zip (from gui/themes directory) (if your port uses new GUI) | *** scummmodern.zip (from gui/themes directory) (if your port uses new GUI) | ||
| Line 102: | Line 103: | ||
*** pred.dic (from dists directory) | *** pred.dic (from dists directory) | ||
*** access.dat (from dists/engine-data) | *** access.dat (from dists/engine-data) | ||
*** access.dat (from dists/engine-data) | |||
*** cryomni3d.dat (from dists/engine-data) | |||
*** drascula.dat (from dists/engine-data) | *** drascula.dat (from dists/engine-data) | ||
*** fonts.dat (from dists/engine-data) | |||
*** hugo.dat (from dists/engine-data) | *** hugo.dat (from dists/engine-data) | ||
*** kyra.dat (from dists/engine-data) | *** kyra.dat (from dists/engine-data) | ||
| Line 110: | Line 114: | ||
*** queen.tbl (from dists/engine-data) | *** queen.tbl (from dists/engine-data) | ||
*** sky.cpt (from dists/engine-data) | *** sky.cpt (from dists/engine-data) | ||
*** supernova.dat (from dists/engine-data) | |||
*** teenagent.dat (from dists/engine-data) | *** teenagent.dat (from dists/engine-data) | ||
*** titanic.dat (from dists/engine-data) | |||
*** tony.dat (from dists/engine-data) | *** tony.dat (from dists/engine-data) | ||
*** toon.dat (from dists/engine-data) | *** toon.dat (from dists/engine-data) | ||
*** wintermute.zip (from dists/engine-data) | *** wintermute.zip (from dists/engine-data) | ||
*** xeen.ccs (from dists/engine-data) | |||
*** your build binary | *** your build binary | ||