333
edits
Difference between revisions of "HOWTO-Release"
m
→Branching for major release
Rootfather (talk | contribs) m (Clarify major vs. minor release) |
Rootfather (talk | contribs) |
||
| Line 29: | Line 29: | ||
*** Lock the component | *** Lock the component | ||
*** Commit pending changes, and push. | *** Commit pending changes, and push. | ||
* Create a branch for the 2. | * Create a branch for the 2.7.x releases from master, named branch-2-7 | ||
** <code>git checkout -b branch-2- | ** <code>git checkout -b branch-2-7 master</code> | ||
* Increase version on branch-2- | * Increase version on branch-2-7 to 2.7.0pre (using <code>devtools/update-version.pl</code>; see below), and commit | ||
** <code>devtools/update-version.pl 2 | ** <code>devtools/update-version.pl 2 7 0 pre</code> | ||
** <code>git commit -m "RELEASE: This is 2. | ** <code>git commit -m "RELEASE: This is 2.7.0pre" -a</code> | ||
* Create annotated tag desc/2. | * Create annotated tag desc/2.7.0pre on that commit and push | ||
** <code>git tag -a -m "Mark 2. | ** <code>git tag -a -m "Mark 2.7.0pre" desc/2.7.0pre</code> | ||
** <code>git push origin tag desc/2. | ** <code>git push origin tag desc/2.7.0pre branch-2-7:branch-2-7</code> | ||
* Update doc/docportal/other_platforms/ios.rst to clone the new branch | * Update doc/docportal/other_platforms/ios.rst to clone the new branch | ||
** Change <code>git clone <nowiki>https://github.com/scummvm/scummvm.git</nowiki></code> to <code>git clone --depth 1 -b branch-2- | ** Change <code>git clone <nowiki>https://github.com/scummvm/scummvm.git</nowiki></code> to <code>git clone --depth 1 -b branch-2-7 <nowiki>https://github.com/scummvm/scummvm.git</nowiki></code> | ||
** <code>git add doc/docportal/other_platforms/ios.rst</code> | ** <code>git add doc/docportal/other_platforms/ios.rst</code> | ||
** <code>git commit -m 'DOC: Update iOS clone command for 2.6 branch'</code> | ** <code>git commit -m 'DOC: Update iOS clone command for 2.6 branch'</code> | ||
** <code>git push</code> | ** <code>git push</code> | ||
* Increase version on master to 2. | * Increase version on master to 2.8.0git, and commit | ||
** <code>git checkout master</code> | ** <code>git checkout master</code> | ||
** <code>devtools/update-version.pl 2 | ** <code>devtools/update-version.pl 2 8 0 git</code> | ||
** <code>git commit -m "RELEASE: This is 2. | ** <code>git commit -m "RELEASE: This is 2.8.0git" -a</code> | ||
* Create annotated tag desc/2.7.0git on that commit and push | * Create annotated tag desc/2.7.0git on that commit and push | ||
** <code>git tag -a -m "Mark 2. | ** <code>git tag -a -m "Mark 2.8.0git" desc/2.8.0git</code> | ||
** <code>git push origin tag desc/2. | ** <code>git push origin tag desc/2.8.0git master</code> | ||
* Switch Weblate to the new branch | * Switch Weblate to the new branch | ||
** Go to the component Version control Settings: https://translations.scummvm.org/settings/scummvm/scummvm/#vcs | ** Go to the component Version control Settings: https://translations.scummvm.org/settings/scummvm/scummvm/#vcs | ||