1,190
edits
(→Testing: Check ADGF_TESTING/UNSTABLE) |
Strangerke (talk | contribs) |
||
(6 intermediate revisions by 2 users not shown) | |||
Line 2: | Line 2: | ||
''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 1.7 and 1.7.0 version. Don't forget to adapt with the adequate version. | |||
Line 9: | Line 11: | ||
* Update the lists of files below, adding new engine data files and such | * Update the lists of files below, adding new engine data files and such | ||
=== Branching for | === Branching for major release === | ||
* Create a branch for the 1.7.x releases from master, named branch-1-7 | * Create a branch for the 1.7.x releases from master, named branch-1-7 | ||
** <code>git checkout -b branch-1-7 master</code> | ** <code>git checkout -b branch-1-7 master</code> | ||
Line 18: | Line 20: | ||
** <code>git tag -m "Mark 1.7.0pre" desc/1.7.0pre</code> | ** <code>git tag -m "Mark 1.7.0pre" desc/1.7.0pre</code> | ||
** <code>git push origin tag desc/1.7.0pre branch-1-7:branch-1-7</code> | ** <code>git push origin tag desc/1.7.0pre branch-1-7:branch-1-7</code> | ||
* Increase version on master to 1. | * Increase version on master to 1.8.0git, and commit | ||
** <code>git checkout master</code> | ** <code>git checkout master</code> | ||
** <code>devtools/update-version.pl 1 | ** <code>devtools/update-version.pl 1 8 0 git</code> | ||
** <code>git commit -m "RELEASE: This is 1. | ** <code>git commit -m "RELEASE: This is 1.8.0git" -a</code> | ||
* Create annotated tag desc/1. | * Create annotated tag desc/1.8.0git on that commit and push | ||
** <code>git tag -m "Mark 1. | ** <code>git tag -m "Mark 1.8.0git" desc/1.8.0git</code> | ||
** <code>git push origin tag desc/1. | ** <code>git push origin tag desc/1.8.0git master</code> | ||
=== Testing === | === Testing === | ||
Line 65: | Line 67: | ||
** Make sure that porters have write access to the release folder on FRS: <code>chmod 775 <folder></code> | ** Make sure that porters have write access to the release folder on FRS: <code>chmod 775 <folder></code> | ||
=== Branching for | === Branching for minor releases === | ||
* Create a branch for 1.7.0 from branch-1-7, named branch-1-7-0 | * Create a branch for 1.7.0 from branch-1-7, named branch-1-7-0 | ||
** <code>git checkout -b branch-1-7-0 branch-1-7</code> | ** <code>git checkout -b branch-1-7-0 branch-1-7</code> | ||
Line 87: | Line 89: | ||
*** NEWS | *** NEWS | ||
*** README (generic ScummVM one) | *** README (generic ScummVM one) | ||
*** localized NEWS and README files (from doc/) (optional) | |||
*** scummmodern.zip (from gui/themes directory) (if your port uses new GUI) | *** scummmodern.zip (from gui/themes directory) (if your port uses new GUI) | ||
*** scummclassic.zip (from gui/themes directory) (if your port uses new GUI) | *** scummclassic.zip (from gui/themes directory) (if your port uses new GUI) | ||
Line 119: | Line 122: | ||
** -solaris-x86.tar.gz as Solaris binary | ** -solaris-x86.tar.gz as Solaris binary | ||
=== Tagging | === Tagging a version === | ||
* When 1.7.0 is ready to be announced, make a permanent v1.7.0 tag in git to mark the release | * When 1.7.0 is ready to be announced, make a permanent v1.7.0 tag in git to mark the release | ||
** <code>git checkout branch-1-7-0</code> | ** <code>git checkout branch-1-7-0</code> |