2017-07-19 12:32:05 +00:00
# Release Policy
2017-07-24 09:56:19 +00:00
#### Definitions:
- `develop` Branch: All new feature developments will go in develop branch
- `staging` Branch: This branch serves as a release candidate. Before a week, release team will pull the feature from develop branch to staging branch.
EG: if the feature is in 25 July's milestone then it should go in staging on 19th July.
- `master` Branch: `master` branch serves as a stable branch. This will use as production deployment.
- `hotfix` Branch: mainly define for support issues. This will include bugs or any high priority task like security patches.
#### Create release from staging
- On Tuesday, we will release from staging to master.
- Versioning: Given a version number MAJOR.MINOR.PATCH, increment the:
- MAJOR version when you make incompatible API changes,
- MINOR version when you add functionality in a backwards-compatible manner, and
- PATCH version when you make backwards-compatible bug fixes.
- Impact on branches:
- merge staging branch to master
- push merge commit back to staging branch
- push merge commit to develop branch
- push merge commit to hotfix branch
- Use release command to create release,
``` usage: bench release APP patch|minor|major --from-branch staging ```
---
2017-07-21 13:35:31 +00:00
#### Create staging branch
2017-07-19 12:32:05 +00:00
2017-07-24 09:56:19 +00:00
- On Wednesday morning, `develop` will be merge into `staging` . `staging` branch is a release candidate. All new features will first go from `develop` to `staging` and then `staging` to `master` .
2017-07-19 12:32:05 +00:00
2017-07-21 13:35:31 +00:00
- Use the prepare-staging command to create staging branch
```usage: bench prepare-staging APP```
2017-07-19 12:32:05 +00:00
2017-07-24 09:56:19 +00:00
- Impact on branches?
2017-07-21 13:35:31 +00:00
- merge all commits from develop branch to staging
- push merge commit back to develop
2017-07-19 12:32:05 +00:00
2017-07-21 13:35:31 +00:00
- QA will use staging for testing.
2017-07-19 12:32:05 +00:00
2017-07-24 09:56:19 +00:00
- Deploy staging branch on frappe.io, erpnext.org, frappe.erpnext.com.
2017-07-19 12:32:05 +00:00
2017-07-21 13:35:31 +00:00
- Only regression and security fixes can be cherry-picked into staging
2017-07-19 12:32:05 +00:00
2017-07-21 13:35:31 +00:00
- Create a discuss post on what all new features or fixes going in next version.
2017-07-19 12:32:05 +00:00
2017-07-21 13:35:31 +00:00
---
2017-07-19 12:32:05 +00:00
2017-07-21 13:35:31 +00:00
#### Create release from hotfix
- Depending on priority, hotfix release will take place.
2017-07-19 12:32:05 +00:00
2017-07-21 13:35:31 +00:00
- Versioning:
2017-07-24 09:56:19 +00:00
- PATCH version when you make backwards-compatible bug fixes.
2017-07-19 12:32:05 +00:00
2017-07-21 13:35:31 +00:00
- Impact on branches:
- merge hotfix branch to master
- push merge commit back to staging branch
- push merge commit to develop branch
- push merge commit to staging branch
- Use release command to create release,
``` usage: bench release APP patch --from-branch hotfix ```