Passer au contenu principal

[Git] Standards + MEP

Workflow:

Feature
  • Create a new branch from development named feature/my-feature
  • Commit code and push
  • Open a Merge (or Pull) Request
  • Wait for approval and for CI to be OK
  • Merge feature/my-feature to development
  • Deploy to preprod
Release
  • Create a new branch from development named release/x.x.x with x.x.x being next release tag
  • No commits should be added to release branch
  • Open a Merge (or Pull) Request from release/x.x.x to master or  main
  • Wait for approval and for CI to be OK
  • Merge
  • Deploy to prod
Hotfix

 This approach should only be used in case of emergency. 

  • Create a new branch from master named hotfix/my-hotfix
  • Commit code and push
  • Open a Merge (or Pull) Request from hotfix/my-hotfix to master
  • Open a Merge (or Pull) Request from hotfix/my-hotfix to development
  • Wait for approval and for CI to be OK
  • Merge on master and on development
  • Deploy to prod
  • Deploy to preprod

Deploy to prod:

  • Create and merge release branch (see recommandations above)
  • Create a Release on repository from master (Deployments --> Releases)
    • Create new tag (this should be the same as the release branch merge request) and use tag as Release title
    • Copy and paste the description of the release merge request, add also a french translation (see picture below)
  • Manually deploy
  • Write the french summary in the Slack channel nouveautés_outils

Capture_d_écran_2021-04-13_à_09.41.56.png

Commit structure:

We use gitmoji standard to make our commits look nicer, that is an arguable choice

{emoji} [{feature}] {What have been done}

Examples

🗃 [Family] Add family model
✨ [Individual] Add Individual create form