1,502
edits
(→Binaries: Mention need to pass "--disable-debug" to configure when building release binaries.) |
(1.4.0 -> 1.7.0) |
||
Line 12: | Line 12: | ||
* 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 | ||
** <code>git checkout -b branch-1-4 master</code> | ** <code>git checkout -b branch-1-4 master</code> | ||
* Increase version on branch-1-4 to 1. | * Increase version on branch-1-4 to 1.7.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 "RELEASE: This is 1. | ** <code>git commit -m "RELEASE: This is 1.7.0pre" -a</code> | ||
* Create annotated tag desc/1. | * Create annotated tag desc/1.7.0pre on that commit and push | ||
** <code>git tag -m "Mark 1. | ** <code>git tag -m "Mark 1.7.0pre" desc/1.7.0pre</code> | ||
** <code>git push origin tag desc/1. | ** <code>git push origin tag desc/1.7.0pre branch-1-4:branch-1-4</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 64: | Line 64: | ||
** 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. | === Branching for 1.7.0 === | ||
* Create a branch for 1. | * Create a branch for 1.7.0 from branch-1-4, named branch-1-4-0 | ||
** <code>git checkout -b branch-1-4-0 branch-1-4</code> | ** <code>git checkout -b branch-1-4-0 branch-1-4</code> | ||
* Increase version on branch-1-4-0 to 1. | * Increase version on branch-1-4-0 to 1.7.0 and commit, push | ||
** <code>devtools/update-version.pl 1 4 0</code> | ** <code>devtools/update-version.pl 1 4 0</code> | ||
** Manually edit backends/platform/maemo/debian/changelog to reflect correct release date for 1. | ** 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. | ** <code>git commit -m "RELEASE: This is 1.7.0" -a</code> | ||
** <code>git push origin branch-1-4-0:branch-1-4-0</code> | ** <code>git push origin branch-1-4-0:branch-1-4-0</code> | ||
Line 118: | Line 118: | ||
** -solaris-x86.tar.gz as Solaris binary | ** -solaris-x86.tar.gz as Solaris binary | ||
=== Tagging 1. | === Tagging 1.7.0 === | ||
* When 1. | * 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-4-0</code> | ** <code>git checkout branch-1-4-0</code> | ||
** <code>git tag -m "Tag v1. | ** <code>git tag -m "Tag v1.7.0" v1.7.0</code> | ||
** <code>git push origin tag v1. | ** <code>git push origin tag v1.7.0</code> | ||
* Also increase the version number on the 1.4.x branch to 1.4.1pre | * Also increase the version number on the 1.4.x branch to 1.4.1pre | ||
** <code>git checkout branch-1-4</code> | ** <code>git checkout branch-1-4</code> |
edits