333
edits
Difference between revisions of "HOWTO-Release"
m
no edit summary
(→Branching for major release: Add instructions for updating iOS doc when creating release branch) |
Rootfather (talk | contribs) m |
||
| Line 3: | Line 3: | ||
''This is work in progress and needs to be completed!'' | ''This is work in progress and needs to be completed!'' | ||
All examples are based on | All examples are based on the 2.6 and 2.6.0 version. Don't forget to adapt with the adequate version number. | ||
| Line 21: | Line 21: | ||
=== Branching for major release === | === Branching for major release === | ||
* Create a branch for the 2. | * Create a branch for the 2.6.x releases from master, named branch-2-6 | ||
** <code>git checkout -b branch-2- | ** <code>git checkout -b branch-2-6 master</code> | ||
* Increase version on branch-2- | * Increase version on branch-2-6 to 2.6.0pre (using <code>devtools/update-version.pl</code>; see below), and commit | ||
** <code>devtools/update-version.pl 2 | ** <code>devtools/update-version.pl 2 6 0 pre</code> | ||
** <code>git commit -m "RELEASE: This is 2. | ** <code>git commit -m "RELEASE: This is 2.6.0pre" -a</code> | ||
* Create annotated tag desc/2. | * Create annotated tag desc/2.6.0pre on that commit and push | ||
** <code>git tag -a -m "Mark 2. | ** <code>git tag -a -m "Mark 2.6.0pre" desc/2.6.0pre</code> | ||
** <code>git push origin tag desc/2. | ** <code>git push origin tag desc/2.6.0pre branch-2-6:branch-2-6</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-6 <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. | ** <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.7.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 7 0 git</code> | ||
** <code>git commit -m "RELEASE: This is 2. | ** <code>git commit -m "RELEASE: This is 2.7.0git" -a</code> | ||
* Create annotated tag desc/2. | * 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.7.0git" desc/2.7.0git</code> | ||
** <code>git push origin tag desc/2. | ** <code>git push origin tag desc/2.7.0git master</code> | ||
*Update buildbot | *Update buildbot | ||
** Edit at the end of [https://github.com/scummvm/dockerized-bb/blob/master/buildbot-config/builds.py builds.py] the line starting with <code>builds.append(ScummVMStableBuild("stable",</code>. | ** Edit at the end of [https://github.com/scummvm/dockerized-bb/blob/master/buildbot-config/builds.py builds.py] the line starting with <code>builds.append(ScummVMStableBuild("stable",</code>. | ||