RSR_Dev Process GitHub - adriancollier/demo GitHub Wiki

We use GitHub for Issue Tracking, Release Planning and as our Code Repository.

Issues:

Check all issues assigned to you on a daily basis.
Raise any issues assigned to you that you CANNOT or WILL NOT work on.
Create an issue if you want to look into something.
If someone raises something to you in Skype or via another method, enter at least the basic info into a GitHub issue.

Branches:

Create a new branch for every issue/feature you are working on.
Name the branch 1234-featurename where 1234 is the issue number of the Leading Issue to solve.
When you have code ready to be merged, create a Pull Request from the Branch to merge into Develop.
Reference a colleagues name in the Pull Request so that they can complete a Code Check on your work.

Code Checks:

Accept a Pull Request only AFTER checking the code for completeness.
Ensure there are no conflicts when merging branches together.
Raise any conflicts with ALL Devs involved - setup a voice chat if needed to clear any misunderstandings.

Environments:

During Feature Development, we should be merging all issues into the Develop branch
This automatically builds to the TEST system at http://rsr.test.akvo.org or http://akvo.akvotest.org.
When we have finalised the code for a release, we should be merging the Develop Branch into the Release/Candidate branch. - - This automatically builds to the UAT System at http://rsr.uat.akvo.org or http://akvo.akvouat.org.

Testing:

Once all issues within a release have been Checked and Merged, the release should be passed on DevOps for QA Testing.
The QA Engineer should have an Issue in Github confirming the list of items that have been changed, and when the release is planned for.
Any issues raised during the Testing process, need to be triaged to determine if they should be fixed before or after the release in question.
Any work to be done within the same release should be included within the GitHub Milestone for the release.
After the Release is present on UAT, any further Code Commits should have a Pull Request to merge the Branch into the Release/Candidate.
Please note that these changes will not be present in Develop. After the Release has been deployed, the Master branch should be Merged back into the Develop branch to create the accurate Development environment again.

Deployment:

Once all issues have been finalised within a Release, and QA have signed off on the Release, we can schedule the Deployment.
We need to tag the Release with the Release number.
Prior to initiating the Release, we need to post an update on the Akvo Status page at http://akvo.statuspage.io/.
Deployment is simple and automatically builds based on the Release being merged into the Master Branch.