We are planning to use the Git-flow branching strategy with CI/CD. It's a conscious decision not to use Trunk based development.
Here's what the pipeline looks like:
Here's what the process looks like:
- developer works on a
- creates a pull request to
developbranch. Code gets reviewed by a developer and merged into develop branch
- develop pipeline gets triggered on a pull request and runs tests, creates build, deploys to
- create a pull request manually/automatically from the
- if approved, triggers
masterbranch code pipeline
- The master branch pipeline runs tests, creates build, deploys to dev, test env
- manual approval pending 9.deployed on prod
Can this be optimized to be more "continuous"? Not a fan of creating and approving pull requests twice. But absolutely need 2 branches. (develop and master). Open to feedback on how this should be improved.