TrustedUser
2,147
edits
(→Tagging a version: described more steps for docs) |
(→Branching for major release: Add instructions for weblate) |
||
Line 21: | Line 21: | ||
=== Branching for major release === | === Branching for major release === | ||
* Before creating the branch make sure there is no pending changes on weblate | |||
** Go to repository maintenance for the ScummVM/scummvm component on the translations website: https://translations.scummvm.org/projects/scummvm/scummvm/#repository | |||
*** Lock the component | |||
*** Commit pending changes, and push. | |||
* Create a branch for the 2.6.x releases from master, named branch-2-6 | * Create a branch for the 2.6.x releases from master, named branch-2-6 | ||
** <code>git checkout -b branch-2-6 master</code> | ** <code>git checkout -b branch-2-6 master</code> | ||
Line 41: | Line 45: | ||
** <code>git tag -a -m "Mark 2.7.0git" desc/2.7.0git</code> | ** <code>git tag -a -m "Mark 2.7.0git" desc/2.7.0git</code> | ||
** <code>git push origin tag desc/2.7.0git master</code> | ** <code>git push origin tag desc/2.7.0git master</code> | ||
*Update buildbot | * Switch Weblate to the new branch | ||
** Go to the component Version control Settings: https://translations.scummvm.org/settings/scummvm/scummvm/#vcs | |||
*** Change the Repository branch setting from master to the new branch | |||
** Go to repository maintenance for the ScummVM/scummvm component on the translations website: https://translations.scummvm.org/projects/scummvm/scummvm/#repository | |||
*** Unlock the component | |||
* 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. |