TrustedUser
2,147
edits
Thunderforge (talk | contribs) (Creating an "Updating the Website" section) |
(→Branching for major release: Add instructions for updating iOS doc when creating release branch) |
||
Line 29: | Line 29: | ||
** <code>git tag -a -m "Mark 2.2.0pre" desc/2.2.0pre</code> | ** <code>git tag -a -m "Mark 2.2.0pre" desc/2.2.0pre</code> | ||
** <code>git push origin tag desc/2.2.0pre branch-2-2:branch-2-2</code> | ** <code>git push origin tag desc/2.2.0pre branch-2-2:branch-2-2</code> | ||
* 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-2 <nowiki>https://github.com/scummvm/scummvm.git</nowiki></code> | |||
** <code>git add doc/docportal/other_platforms/ios.rst</code> | |||
** <code>git commit -m 'DOC: Update iOS clone command for 2.2 branch'</code> | |||
** <code>git push</code> | |||
* Increase version on master to 2.3.0git, and commit | * Increase version on master to 2.3.0git, and commit | ||
** <code>git checkout master</code> | ** <code>git checkout master</code> | ||
Line 36: | Line 41: | ||
** <code>git tag -a -m "Mark 2.3.0git" desc/2.3.0git</code> | ** <code>git tag -a -m "Mark 2.3.0git" desc/2.3.0git</code> | ||
** <code>git push origin tag desc/2.3.0git master</code> | ** <code>git push origin tag desc/2.3.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>. | ||
** Remove the customizations in <code>class ScummVMStableBuild</code> if there were any to make the code inherit from ScummVMBuild without any difference. | ** Remove the customizations in <code>class ScummVMStableBuild</code> if there were any to make the code inherit from ScummVMBuild without any difference. |