Resources attached to the Road To DevOps tutorial
https://blog.noobtoroot.xyz/road-to-devops/
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
198 lines
9.5 KiB
198 lines
9.5 KiB
2 years ago
|
<!-- .slide: data-background="#2E2E2E" data-state="nologo-slide" -->
|
||
|
|
# Workflow de développement
|
||
|
|
|
||
|
|
@@
|
||
|
|
## Les attentes
|
||
|
|
* Pouvoir développer sereinement.
|
||
|
|
* Favoriser le travail en équipe.
|
||
|
|
* Respecter les différentes phases d'un projet.
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
@@
|
||
|
|
## Le modèle de branche de Vincent Driessen
|
||
|
|
* Apporte des conventions de nommage.
|
||
|
|
* Apporte de la lisibilité dans l’arbre git.
|
||
|
|
* Colle au plus prêt des phases d’un projet.
|
||
|
|
* Adopté comme standard par les utilisateurs de git.
|
||
|
|
* Automatisé grâce à **git-flow**.
|
||
|
|
|
||
|
|
@@
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; min-width: 30px; min-height: 30px; width: 960px; left: 0px; top: 1px;" data-block-id="00daf6095fdaf3f0d2e81032e0501491">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 11;">
|
||
|
|
<h2>Les Branches principales</h2>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="image" style="min-width: 4px; min-height: 4px; width: 568px; height: 582px; left: 375px; top: 106px;" data-block-id="fccf06f8989d17ad8da2dba5cc4a4a54">
|
||
|
|
<div class="sl-block-content" style="z-index: 12;">
|
||
|
|
<img src="svg/gitflow_base.svg" data-natural-width="122" data-natural-height="125" style=""/>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="shape" style="min-width: 4px; min-height: 4px; width: 348px; height: 577px; left: 14px; top: 106px;" data-block-id="26c9a4310c3c9e793d460869c6751418">
|
||
|
|
<div class="sl-block-content" data-shape-type="rect" data-shape-fill-color="rgb(238, 238, 238)" data-shape-stretch="true" style="z-index: 13;">
|
||
|
|
<svg
|
||
|
|
xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" preserveAspectRatio="none" viewBox="0 0 348 577">
|
||
|
|
<rect width="348" height="577" rx="0" ry="0" class="shape-element" fill="rgb(238, 238, 238)"></rect>
|
||
|
|
</svg>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; min-width: 30px; min-height: 30px; width: 342px; left: 20px; top: 112px;" data-block-id="6f8a0c18fcd6bc596aeab87efa5d2f55">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 14;">
|
||
|
|
<p>
|
||
|
|
<strong>Master</strong>
|
||
|
|
</p>
|
||
|
|
<p>Au plus proche de la production</p>
|
||
|
|
<p> </p>
|
||
|
|
<p>
|
||
|
|
<strong>Develop</strong>
|
||
|
|
</p>
|
||
|
|
<p>Branche d'intégration / de développement</p>
|
||
|
|
<p> </p>
|
||
|
|
<p> </p>
|
||
|
|
<p>
|
||
|
|
<code>git flow init</code>
|
||
|
|
</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
|
||
|
|
@@
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; width: 960px; left: 0px; top: 2px;" data-block-id="2de1c2376df86e4c42a23d5056771292">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 11;">
|
||
|
|
<h2>Nouvelles fonctionnalités</h2>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="shape" style="width: 348px; height: 577px; left: 14px; top: 106px;" data-block-id="2192cee4dddbc21bb8b4d25aeb100524">
|
||
|
|
<div class="sl-block-content" data-shape-type="rect" data-shape-fill-color="rgb(238, 238, 238)" data-shape-stretch="true" style="z-index: 12;">
|
||
|
|
<svg
|
||
|
|
xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" preserveAspectRatio="none" viewBox="0 0 348 577">
|
||
|
|
<rect width="348" height="577" rx="0" ry="0" class="shape-element" fill="rgb(238, 238, 238)"></rect>
|
||
|
|
</svg>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; width: 342px; left: 20px; top: 112px;" data-block-id="85a777e523e18414681523db8cb4a5ee">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 13;">
|
||
|
|
<p>
|
||
|
|
<strong>Feature</strong>
|
||
|
|
</p>
|
||
|
|
<p>Couvre un périmètre fonctionnel</p>
|
||
|
|
<p> </p>
|
||
|
|
<p>chaque feature est reportée par un merge sur la branche
|
||
|
|
<strong>Develop</strong>
|
||
|
|
</p>
|
||
|
|
<p> </p>
|
||
|
|
<p>
|
||
|
|
<span>
|
||
|
|
<code style="font-size:0.5em">git flow feature start nom_feature</code>
|
||
|
|
<br/>
|
||
|
|
<code style="font-size:0.5em">git flow feature finish nom_feature
|
||
|
|
</code>
|
||
|
|
</span>
|
||
|
|
</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="image" style="min-width: 4px; min-height: 4px; width: 567px; height: 241px; left: 382px; top: 255px;" data-block-id="fa733bd6cf25697657ec7e345c58d4c1">
|
||
|
|
<div class="sl-block-content" style="z-index: 14;">
|
||
|
|
<img style="" data-natural-width="134" data-natural-height="57" src="svg/gitflow_feature.svg" data-lazy-loaded=""/>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
|
||
|
|
@@
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; width: 960px; left: 0px; top: 2px;" data-block-id="a097fea5d8d9ff690b75d3daf7ee2431">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 11;">
|
||
|
|
<h2>Version prête pour recette</h2>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="shape" style="width: 348px; height: 577px; left: 14px; top: 106px;" data-block-id="45231cba4f7edca89c0c5e9f418c9b7e">
|
||
|
|
<div class="sl-block-content" data-shape-type="rect" data-shape-fill-color="rgb(238, 238, 238)" data-shape-stretch="true" style="z-index: 12;">
|
||
|
|
<svg
|
||
|
|
xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" preserveAspectRatio="none" viewBox="0 0 348 577">
|
||
|
|
<rect width="348" height="577" rx="0" ry="0" class="shape-element" fill="rgb(238, 238, 238)"></rect>
|
||
|
|
</svg>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; width: 342px; left: 20px; top: 111px;" data-block-id="cda0f027045e3155ba3e8a00ad4ca1e6">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 13;">
|
||
|
|
<p>
|
||
|
|
<strong>Release</strong>
|
||
|
|
</p>
|
||
|
|
<p>Contient un ensemble de version</p>
|
||
|
|
<p>Le nom correspondra au tag</p>
|
||
|
|
<p> </p>
|
||
|
|
<p>Lors de la fermeture les commits sont :</p>
|
||
|
|
<p>reportés dans
|
||
|
|
<strong>Develop</strong>
|
||
|
|
</p>
|
||
|
|
<p>reportés dans
|
||
|
|
<strong>Master</strong>
|
||
|
|
</p>
|
||
|
|
<p>un
|
||
|
|
<strong>Tag </strong>est créé
|
||
|
|
</p>
|
||
|
|
<p>
|
||
|
|
<code style="font-size:0.5em">git flow release start nom_release</code>
|
||
|
|
<br/>
|
||
|
|
<code style="font-size:0.5em">git flow release finish nom_release</code>
|
||
|
|
</span>
|
||
|
|
</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="image" style="min-width: 4px; min-height: 4px; width: 560px; height: 398px; left: 389px; top: 187px;" data-block-id="eaa6a17fd76903eaad4a911c747703a6">
|
||
|
|
<div class="sl-block-content" style="z-index: 14;">
|
||
|
|
<img src="svg/gitflow_release.svg" data-natural-width="183" data-natural-height="130" style=""/>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
|
||
|
|
@@
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; width: 960px; left: 0px; top: 2px;" data-block-id="f79aeecff71522cc4f175befb859b5c1">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 11;">
|
||
|
|
<h2>corrections de production</h2>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="shape" style="width: 348px; height: 577px; left: 14px; top: 106px;" data-block-id="030e6e477642f8bd543f5cc78242a745">
|
||
|
|
<div class="sl-block-content" data-shape-type="rect" data-shape-fill-color="rgb(238, 238, 238)" data-shape-stretch="true" style="z-index: 12;">
|
||
|
|
<svg
|
||
|
|
xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" preserveAspectRatio="none" viewBox="0 0 348 577">
|
||
|
|
<rect width="348" height="577" rx="0" ry="0" class="shape-element" fill="rgb(238, 238, 238)"></rect>
|
||
|
|
</svg>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; width: 342px; left: 20px; top: 111px;" data-block-id="1ee332d11536e1dc5cb06bae323c4acc">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 13;">
|
||
|
|
<p>
|
||
|
|
<strong>Hotfix</strong>
|
||
|
|
</p>
|
||
|
|
<p>Ne contient que des correctifs</p>
|
||
|
|
<p>Le nom correspondra au tag</p>
|
||
|
|
<p> </p>
|
||
|
|
<p>Lors de la fermeture les commits sont :</p>
|
||
|
|
<p>reportés dans
|
||
|
|
<strong>Develop</strong>
|
||
|
|
</p>
|
||
|
|
<p>reportés dans
|
||
|
|
<strong>Master</strong>
|
||
|
|
</p>
|
||
|
|
<p>un
|
||
|
|
<strong>Tag </strong>est créé
|
||
|
|
</p>
|
||
|
|
<p> </p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="image" style="min-width: 4px; min-height: 4px; width: 583px; height: 414px; left: 377px; top: 140px;" data-block-id="91dacd8f7c2c3209b02444898620e6cc">
|
||
|
|
<div class="sl-block-content" style="z-index: 14;" data-inline-svg="false">
|
||
|
|
<img src="svg/gitflow_hotfix.svg" style="" data-natural-width="183" data-natural-height="130"/>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sl-block" data-block-type="text" style="height: auto; min-width: 30px; min-height: 30px; width: 600px; left: 320px; top: 569px;" data-block-id="ed0fa953b598b2330a29d0e550122f3c">
|
||
|
|
<div class="sl-block-content" data-placeholder-tag="p" data-placeholder-text="Text" style="z-index: 15;">
|
||
|
|
<p>
|
||
|
|
<code style="font-size:0.5em">git flow hotfix start nom_hotfix</code>
|
||
|
|
<br/>
|
||
|
|
<code style="font-size:0.5em">git flow hotfix finish nom_hotfix</code>
|
||
|
|
</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
|
||
|
|
@@
|
||
|
|
## Git Flow : vision globale
|
||
|
|
|