dashinay
commented
5 years ago Due to some issues and complication with working on one single repository for the whole project Dev ops team have meet and decided on creating separate repositories. Need a research on git flow branch structuring and automation scrips/tools for branch creation.
Estimated time on changes: 4 hours
Work done on changes:
-
Done research on git flow: git-flow
-
Created separate repositories for each team using the git flow branch structuring
-
Managed the file structures for each team
-
Each repository now have production(prod) and developments(dev) branches.
-
New developments(new features) now are built in feature branches which would be pushed on dev branch when it is ready.
-
For the safety purposes every repository's dev(2) and prod(3) required pull request approvals.
-
git-flow scripts are used for automation of creation for supporting branches(feature, hot-fix, release).
Time spent on changes: 4 hours
Additionally, in order to get more perspective CI we have done additional research on Travis CI: Continuous Integration with Travis CI and Amazon Webservices
Time spent on research: 2 hours
Task assigned to: Bettelham and Dawit The objective of the task is to create working repository(s) and branching structures for teams to work on the project. Needs researching on branching structures for the repository(s).
Estimated completion time: 3 hours
Team decided on creating one single repository for all teams. Depending on the job done is:
We created a separate dev branches for each team.
We have created a separate production branches for each team which is protected by pull request and number of approvals.
We have created one main dev so all the teams are able to be up-to-date on other team's code.
Time spent: 4 hours