178
edits
(→Branching: Update for new procedure) |
(Further updates for new procedure) |
||
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 1.4.x === | ||
* Create a branch for the 1.4.x releases from master, named branch-1-4 | * Create a branch for the 1.4.x releases from master, named branch-1-4 | ||
** git checkout -b branch-1-4 master | ** git checkout -b branch-1-4 master | ||
* Increase version on branch-1-4 to 1.4.0pre (using <code>devtools/update-version.pl</code>; see below), and commit | * Increase version on branch-1-4 to 1.4.0pre (using <code>devtools/update-version.pl</code>; see below), and commit | ||
** <code>devtools/update-version.pl 1 4 0 pre</code> | ** <code>devtools/update-version.pl 1 4 0 pre</code> | ||
** <code>git commit -m "This is 1.4.0pre" -a</code> | ** <code>git commit -m "RELEASE: This is 1.4.0pre" -a</code> | ||
* Create annotated tag desc/1.4.0pre on that commit and push | * Create annotated tag desc/1.4.0pre on that commit and push | ||
** <code>git tag -m "Mark 1.4.0pre" desc/1.4.0pre</code> | ** <code>git tag -m "Mark 1.4.0pre" desc/1.4.0pre</code> | ||
Line 28: | Line 21: | ||
** <code>git checkout master</code> | ** <code>git checkout master</code> | ||
** <code>devtools/update-version.pl 1 5 0 git</code> | ** <code>devtools/update-version.pl 1 5 0 git</code> | ||
** <code>git commit -m "This is 1.5.0git" -a</code> | ** <code>git commit -m "RELEASE: This is 1.5.0git" -a</code> | ||
* Create annotated tag desc/1.5.0git on that commit and push | * Create annotated tag desc/1.5.0git on that commit and push | ||
** <code>git tag -m "Mark 1.5.0git" desc/1.5.0git</code> | ** <code>git tag -m "Mark 1.5.0git" desc/1.5.0git</code> | ||
** <code>git push origin tag desc/1.5.0git master</code> | ** <code>git push origin tag desc/1.5.0git master</code> | ||
=== Testing === | |||
* Identify release critical (show stopper) bugs and get people to fix them. | |||
* Identify other important bugs and get people to fix them. | |||
* Get even more people to fix all the other bugs, if possible :-). | |||
* Get people to do lots of testing, possibly by asking for help via a news item. | |||
* Collect all that information (e.g. in the Wiki). See [[Release Testing]] | |||
=== Preparing the source === | === Preparing the source === | ||
Line 62: | Line 62: | ||
** There is a script <code>tools/dist-scummvm.sh</code>, which does this automatically. | ** There is a script <code>tools/dist-scummvm.sh</code>, which does this automatically. | ||
** Make sure that porters have write access to the release folder on FRS: <code>chmod 775 <folder></code> | ** Make sure that porters have write access to the release folder on FRS: <code>chmod 775 <folder></code> | ||
=== Branching for 1.4.0 === | |||
* Create a branch for 1.4.0 from branch-1-4, named branch-1-4-0 | |||
** git checkout -b branch-1-4-0 branch-1-4 | |||
* Increase version on branch-1-4-0 to 1.4.0 and commit, push | |||
** <code>devtools/update-version.pl 1 4 0</code> | |||
** <code>git commit -m "RELEASE: This is 1.4.0" -a</code> | |||
** <code>git push origin branch-1-4-0:branch-1-4-0</code> | |||
=== Binaries === | === Binaries === | ||
Line 98: | Line 106: | ||
** Add a news item. | ** Add a news item. | ||
** Update default platform packages on sf.net FRS | ** Update default platform packages on sf.net FRS | ||
=== Tagging 1.4.0 === | |||
* When 1.4.0 is ready to be announced, make a permanent v1.4.0 tag in git to mark the release | |||
** <code>git checkout branch-1-4-0</code> | |||
** <code>git tag -m "Tag 1.4.0" v1.4.0</code> | |||
** <code>git push origin tag v1.4.0</code> | |||
* Also increase the version number on the 1.4.x branch to 1.4.1pre | |||
** <code>devtools/update-version.pl 1 4 1 pre</code> | |||
** <code>git commit -m "RELEASE: This is 1.4.1pre" -a</code> | |||
* Create annotated tag desc/1.4.1pre on that commit and push | |||
** <code>git tag -m "Mark 1.4.1pre" desc/1.4.1pre</code> | |||
** <code>git push origin tag desc/1.4.1pre branch-1-4:branch-1-4</code> | |||
=== News & Notification === | === News & Notification === |
edits