Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "Wazaabi/Delivery"
< Wazaabi
| Line 12: | Line 12: | ||
** In develop branch, increase service version of all plugins. | ** In develop branch, increase service version of all plugins. | ||
** Update [[Wazaabi/ChangeLog|change log]] with fixed bugs. | ** Update [[Wazaabi/ChangeLog|change log]] with fixed bugs. | ||
| + | |||
| + | |||
| + | git fetch origin | ||
| + | git checkout develop | ||
| + | git merge origin/develop | ||
| + | git checkout master | ||
| + | git merge origin/master | ||
| + | git merge develop | ||
| + | git tag -a "v0.X.Y" -m "RELEASE 0.X.Y" | ||
| + | git push origin v0.X.Y | ||
| + | git push origin master | ||
| + | |||
| + | ''update version of all plugins in develop'' | ||
| + | in case of break of interface [TODO : define a explicitely break of interface] | ||
| + | |||
| + | update version from v0.X.Y to v0.X+1.0, for instance if version was 0.6.5, the version becomes 0.7.0 | ||
| + | |||
| + | otherwise | ||
| + | |||
| + | update version from 0.X.Y to v0.X.Y+1, for instance if version was 0.6.5 it becomse 0.6.6 | ||
Revision as of 09:10, 11 April 2013
- Feature delivery happens once a month from the master branch:
- Merge develop branch to master.
- Create a tag on master branch v<major>_<minor>_<service> (e.g. v0_6_0).
- Update change log with list of new features.
- In develop branch, increase service version of all plugins.
- When any interface break, increase minor version of all plugins.
- Fixes for Major or Critical bugs can be delivered on demand basis on previous monthly delivery:
- Do NOT merge to master any new stuff except the bug fix.
- Create a tag on master branch v<major>_<minor>_<service> (e.g. v0_6_1).
- Merge immediately to develop branch the bug fix.
- In develop branch, increase service version of all plugins.
- Update change log with fixed bugs.
git fetch origin
git checkout develop
git merge origin/develop
git checkout master
git merge origin/master
git merge develop
git tag -a "v0.X.Y" -m "RELEASE 0.X.Y"
git push origin v0.X.Y
git push origin master
update version of all plugins in develop in case of break of interface [TODO : define a explicitely break of interface]
update version from v0.X.Y to v0.X+1.0, for instance if version was 0.6.5, the version becomes 0.7.0
otherwise
update version from 0.X.Y to v0.X.Y+1, for instance if version was 0.6.5 it becomse 0.6.6