1,489
edits
Difference between revisions of "HOWTO-Release"
Jump to navigation
Jump to search
1.4.0 -> 1.7.0, part 2
(1.4.0 -> 1.7.0) |
(1.4.0 -> 1.7.0, part 2) |
||
| 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. | === Branching for 1.7.x === | ||
* Create a branch for the 1. | * Create a branch for the 1.7.x releases from master, named branch-1-7 | ||
** <code>git checkout -b branch-1- | ** <code>git checkout -b branch-1-7 master</code> | ||
* Increase version on branch-1- | * Increase version on branch-1-7 to 1.7.0pre (using <code>devtools/update-version.pl</code>; see below), and commit | ||
** <code>devtools/update-version.pl 1 | ** <code>devtools/update-version.pl 1 7 0 pre</code> | ||
** <code>git commit -m "RELEASE: This is 1.7.0pre" -a</code> | ** <code>git commit -m "RELEASE: This is 1.7.0pre" -a</code> | ||
* Create annotated tag desc/1.7.0pre on that commit and push | * Create annotated tag desc/1.7.0pre on that commit and push | ||
** <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- | ** <code>git push origin tag desc/1.7.0pre branch-1-7:branch-1-7</code> | ||
* Increase version on master to 1.5.0git, and commit | * Increase version on master to 1.5.0git, and commit | ||
** <code>git checkout master</code> | ** <code>git checkout master</code> | ||
| Line 56: | Line 56: | ||
* Make sure package descriptions are up-to-date: | * Make sure package descriptions are up-to-date: | ||
** dists/redhat/scummvm.spec | ** dists/redhat/scummvm.spec | ||
* Create MSVC project files in the release branch (for example branch-1- | * Create MSVC project files in the release branch (for example branch-1-7-0, where the tarballs are created from) | ||
** make ideprojects | ** make ideprojects | ||
** git commit -m "DISTS: Generated Code::Blocks and MSVC project files" | ** git commit -m "DISTS: Generated Code::Blocks and MSVC project files" | ||
| Line 65: | Line 65: | ||
=== Branching for 1.7.0 === | === Branching for 1.7.0 === | ||
* Create a branch for 1.7.0 from branch-1- | * Create a branch for 1.7.0 from branch-1-7, named branch-1-7-0 | ||
** <code>git checkout -b branch-1- | ** <code>git checkout -b branch-1-7-0 branch-1-7</code> | ||
* Increase version on branch-1- | * Increase version on branch-1-7-0 to 1.7.0 and commit, push | ||
** <code>devtools/update-version.pl 1 | ** <code>devtools/update-version.pl 1 7 0</code> | ||
** Manually edit backends/platform/maemo/debian/changelog to reflect correct release date for 1.7.0 entry | ** Manually edit backends/platform/maemo/debian/changelog to reflect correct release date for 1.7.0 entry | ||
** <code>git commit -m "RELEASE: This is 1.7.0" -a</code> | ** <code>git commit -m "RELEASE: This is 1.7.0" -a</code> | ||
** <code>git push origin branch-1- | ** <code>git push origin branch-1-7-0:branch-1-7-0</code> | ||
=== Binaries === | === Binaries === | ||
| Line 120: | Line 120: | ||
=== Tagging 1.7.0 === | === Tagging 1.7.0 === | ||
* When 1.7.0 is ready to be announced, make a permanent v1.7.0 tag in git to mark the release | * When 1.7.0 is ready to be announced, make a permanent v1.7.0 tag in git to mark the release | ||
** <code>git checkout branch-1- | ** <code>git checkout branch-1-7-0</code> | ||
** <code>git tag -m "Tag v1.7.0" v1.7.0</code> | ** <code>git tag -m "Tag v1.7.0" v1.7.0</code> | ||
** <code>git push origin tag v1.7.0</code> | ** <code>git push origin tag v1.7.0</code> | ||
* Also increase the version number on the 1. | * Also increase the version number on the 1.7.x branch to 1.7.1pre | ||
** <code>git checkout branch-1- | ** <code>git checkout branch-1-7</code> | ||
** <code>devtools/update-version.pl 1 | ** <code>devtools/update-version.pl 1 7 1 pre</code> | ||
** <code>git commit -m "RELEASE: This is 1. | ** <code>git commit -m "RELEASE: This is 1.7.1pre" -a</code> | ||
* Create annotated tag desc/1. | * Create annotated tag desc/1.7.1pre on that commit and push | ||
** <code>git tag -m "Mark 1. | ** <code>git tag -m "Mark 1.7.1pre" desc/1.7.1pre</code> | ||
** <code>git push origin tag desc/1. | ** <code>git push origin tag desc/1.7.1pre branch-1-7:branch-1-7</code> | ||
=== News & Notification === | === News & Notification === | ||