accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-06 23:44:03 +00:00
Code Issues Releases Activity

[fix] detailed release policy

Browse Source
This commit is contained in:
Saurabh 2017-07-24 15:26:19 +05:30
parent cc6c58ed3c
commit f9e3dedf3b
4 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
bench/docs/branch_details.md → docs/branch_details.md
View File

0
bench/docs/contribution_guidelines.md → docs/contribution_guidelines.md
View File

57
bench/docs/release_policy.md → docs/release_policy.md
View File

@ -1,33 +1,19 @@
# Release Policy # Release Policy
#### Create staging branch #### Definitions:
- `develop` Branch: All new feature developments will go in develop branch
- On Wednesday morning, we will create a `staging` branch from develop branch. `staging` branch is a release candidate. All new features will first go from `develop` to `staging` and then `staging` to `master`. - `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.
- Use the prepare-staging command to create staging branch - `master` Branch: `master` branch serves as a stable branch. This will use as production deployment.
```usage: bench prepare-staging APP``` - `hotfix` Branch: mainly define for support issues. This will include bugs or any high priority task like security patches.
- Impact on branches ?
- merge all commits from develop branch to staging
- push merge commit back to develop
- QA will use staging for testing.
- Deploy staging branch on frappe.io
- Only regression and security fixes can be cherry-picked into staging
- Create a discuss post on what all new features or fixes going in next version.
---
#### Create release from staging #### Create release from staging
- On Tuesday, we will release from staging to master. - On Tuesday, we will release from staging to master.
- Versioning: - Versioning: Given a version number MAJOR.MINOR.PATCH, increment the:
- patch: Small fixes - MAJOR version when you make incompatible API changes,
- minor: For new features updates. - MINOR version when you add functionality in a backwards-compatible manner, and
- major: If any API changes - PATCH version when you make backwards-compatible bug fixes.
- Impact on branches: - Impact on branches:
- merge staging branch to master - merge staging branch to master
@ -40,11 +26,32 @@
--- ---
#### Create staging branch
- 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`.
- Use the prepare-staging command to create staging branch
```usage: bench prepare-staging APP```
- Impact on branches?
- merge all commits from develop branch to staging
- push merge commit back to develop
- QA will use staging for testing.
- Deploy staging branch on frappe.io, erpnext.org, frappe.erpnext.com.
- Only regression and security fixes can be cherry-picked into staging
- Create a discuss post on what all new features or fixes going in next version.
---
#### Create release from hotfix #### Create release from hotfix
- Depending on priority, hotfix release will take place. - Depending on priority, hotfix release will take place.
- Versioning: - Versioning:
- patch: Small fixes - PATCH version when you make backwards-compatible bug fixes.
- Impact on branches: - Impact on branches:
- merge hotfix branch to master - merge hotfix branch to master

0
bench/docs/releasing_frappe_erpext.md → docs/releasing_frappe_erpext.md
View File