This page gives an overview of our development process and our gitflow procedure.
This section gives an overview of all the processes that are taking place in all of SONIA's development process. The following diagram gives a macro-level view of our development process
In this section the code process is described in detail. When action is required in transition, they are described on top of the arrow.
This is our Gitflow methodology since following our recent process review :
Before doing a PR from
developmake sure to increment the<version>tag of the package into thepackage.xmlfile since this will be used as a reference to create package release and tag version.
If the version tag is not updated the workflows won't be able to complete their task successfully
First of all, we will introduce all the branches we will be using :
master: Will contain the previous pool test code release and will be taggeddevelop: Will contain pool tested codefeature: These branches will contain newly developed featuresWe will start with the master and develop branch since they are the base of our Gitflow
Our rules one both the master and develop branch will be the following:
Both master and develop branch are locked on git push. To push into the develop and master branch we will be using Pull Request (PR) from a feature branch.
Pull Request (PR) can be created from GitHub repositories.
When developing a feature or modifying existing code, you will need to create a new feature branch. Here is an example of a feature branch name, feature/this-is-my-new-feature. Your branch name will follow those conventions:
develop
Upon accepting pull request from feature branch to develop feature branches will be merged automatically into develop.