329
edits
Difference between revisions of "HOWTO-Release"
Jump to navigation
Jump to search
m
Clarify major vs. minor release
(→Branching for major release: Add instructions for updating iOS doc when creating release branch) |
Rootfather (talk | contribs) m (Clarify major vs. minor release) |
||
| (6 intermediate revisions by 3 users not shown) | |||
| 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. | ||
=== Definitions === | |||
* Major release: A major release marks the leap from e.g. ScummVM 2.6.x to 2.7.x | |||
* Minor release: A minor release marks the exact version we release, e.g. ScummVM 2.6.0 or 2.6.1. | |||
=== Preparations === | === Preparations === | ||
| Line 21: | Line 25: | ||
=== Branching for major release === | === Branching for major release === | ||
* Create a branch for the 2. | * Before creating the branch make sure there is no pending changes on weblate | ||
** <code>git checkout -b branch-2- | ** Go to repository maintenance for the ScummVM/scummvm component on the translations website: https://translations.scummvm.org/projects/scummvm/scummvm/#repository | ||
* Increase version on branch-2- | *** Lock the component | ||
** <code>devtools/update-version.pl 2 | *** Commit pending changes, and push. | ||
** <code>git commit -m "RELEASE: This is 2. | * Create a branch for the 2.6.x releases from master, named branch-2-6 | ||
* Create annotated tag desc/2. | ** <code>git checkout -b branch-2-6 master</code> | ||
** <code>git tag -a -m "Mark 2. | * Increase version on branch-2-6 to 2.6.0pre (using <code>devtools/update-version.pl</code>; see below), and commit | ||
** <code>git push origin tag desc/2. | ** <code>devtools/update-version.pl 2 6 0 pre</code> | ||
** <code>git commit -m "RELEASE: This is 2.6.0pre" -a</code> | |||
* Create annotated tag desc/2.6.0pre on that commit and push | |||
** <code>git tag -a -m "Mark 2.6.0pre" desc/2.6.0pre</code> | |||
** <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 | * 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. | ||
| Line 62: | Line 75: | ||
=== Preparing the source === | === Preparing the source === | ||
* Browse 'git log' since the previous release and add all significant changes to the NEWS file | * Browse 'git log' since the previous release and add all significant changes to the NEWS file | ||
* | * For a major release, make sure the translations.dat file is up to date. | ||
** 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 and push pending changes | |||
** Use ''make translations-dat'' to update the translations data file (and then commit it if it was changed). | |||
** At this point Weblate can be switched back to master: | |||
*** Copy all po/*po file from the release branch | |||
*** In master branch run <code>make updatepot ; make po/*.po</code> | |||
*** Commit and push: <code>git add po/scummvm.pot po/*.po ; git commit -m "I18N: Merge translations from branch-2-6" ; git push</code> | |||
*** On https://translations.scummvm.org/settings/scummvm/scummvm/#vcs switch the repository branch setting back to master | |||
*** On https://translations.scummvm.org/projects/scummvm/scummvm/#repository unlock the component | |||
* You have to update the versions in all relevant files. There is a script, <code>devtools/update-version.pl</code> meant to help you with this. It will generate/update the following files: | * You have to update the versions in all relevant files. There is a script, <code>devtools/update-version.pl</code> meant to help you with this. It will generate/update the following files: | ||
** base/internal_version.h | ** base/internal_version.h | ||
| Line 134: | Line 157: | ||
* Edit <code>include/config.inc.php</code> to update the global version. | * Edit <code>include/config.inc.php</code> to update the global version. | ||
* Add a news item. | * Add a news item. | ||
* Follow the instructions at [https://wiki.scummvm.org/index.php?title=HOWTO-Release#Signing_binaries HOWTO-Release#Signing binaries] in order to enable updates via (Win)Sparkle | * Follow the instructions at [https://wiki.scummvm.org/index.php?title=HOWTO-Release#Signing_binaries HOWTO-Release#Signing binaries] in order to enable updates via (Win)Sparkle | ||
| Line 146: | Line 167: | ||
* On [https://docs.google.com/spreadsheets/d/1QzwFleEKXOsE59cYMOcQB7C2f0Np48uAQOCG8kicX_s/edit#gid=854570757 the ScummVM Data spreadsheet] | * On [https://docs.google.com/spreadsheets/d/1QzwFleEKXOsE59cYMOcQB7C2f0Np48uAQOCG8kicX_s/edit#gid=854570757 the ScummVM Data spreadsheet] | ||
** On the <code>versions</code> tab, add the new release to the bottom of the list | ** On the <code>versions</code> tab, add the new release to the bottom of the list | ||
** On the <code>scummvm_downloads</code> tab, for any releases that have been uploaded to FRS, change the <code>version</code> column to match the latest version | ** On the <code>scummvm_downloads</code> tab, for any releases that have been uploaded to FRS, change the <code>version</code> column to match the latest version. Verify that all ports that don't have the new version (yet) are set to "old", so they appear in the right section of our website. | ||
**'''WARNING:''' The website update script keeps track of the different sheets in the spreadsheet file based on an internal ID. You '''must''' use the exact same sheet for every release. This means that you have to temporarily duplicate the downloads sheet and constantly update it while the porters submit their builds - you don't want to all builds at once right before the release. As soon as the release is about to get published, '''copy over all content of the temporary scummvm_downloads sheet to the productive one.''' '''You must not rename the old sheet under any circumstances, it will break the website!''' | |||
=== Tagging a version === | === Tagging a version === | ||
| Line 161: | Line 183: | ||
** <code>git push origin tag desc/1.7.1pre branch-1-7:branch-1-7</code> | ** <code>git push origin tag desc/1.7.1pre branch-1-7:branch-1-7</code> | ||
*Add this doc to the Read The Doc admin settings to generate the documentation for this version. | *Add this doc to the Read The Doc admin settings to generate the documentation for this version. | ||
** Open [https://readthedocs.org/dashboard/ Read The Docs Portal] | |||
**# Click on '''ScummVM''' | |||
**# Click on '''Versions''' | |||
**# Find the relevant tag like 'v2.6.0' | |||
**# Press '''Activate''' | |||
=== Creating source tarballs === | === Creating source tarballs === | ||