Skip to content

Instantly share code, notes, and snippets.

@pulkitsinghal
Last active February 19, 2019 13:03
Show Gist options
  • Select an option

  • Save pulkitsinghal/479169e4de57ac2a06fc439fda7d5cdf to your computer and use it in GitHub Desktop.

Select an option

Save pulkitsinghal/479169e4de57ac2a06fc439fda7d5cdf to your computer and use it in GitHub Desktop.

Revisions

  1. pulkitsinghal revised this gist Jul 22, 2018. 1 changed file with 15 additions and 9 deletions.
    24 changes: 15 additions & 9 deletions release-candidate.mermaid
    Original file line number Diff line number Diff line change
    @@ -1,7 +1,7 @@
    graph TD
    dev(develop is at v.1.0.0)
    dev(develop is at v1.0.0)

    dev --> |git checkout -b release/v1.0.1-rc1 develop| rc1(release/1.0.1-rc1)
    dev --> |git checkout -b release/v1.0.1-rc1 develop| rc1(release/v1.0.1-rc1)
    rc1 --> |merge PR for featureA| dev1
    rc1 --> |merge PR for featureB| dev1
    dev1{Deploy & Test on DEV1} --> decisionA1((PASS))
    @@ -10,13 +10,19 @@ release1.0.1_pass1 --> staging{Deploy & Test on STAGING}
    staging -->decisionA2((PASS))
    decisionA2 --> release1.0.1_pass2(release/v1.0.1)
    release1.0.1_pass2 --> |git flow release finish v1.0.1| master
    release1.0.1_pass2 --> |git flow release finish v1.0.1| develop(develop is at v.1.0.1)
    release1.0.1_pass2 --> |git flow release finish v1.0.1| develop(develop is at v1.0.1)
    master --> uat{Deploy & Test on UAT}
    uat --> decisionA3((PASS))

    dev --> |git checkout -b release/v1.0.1-rc2 develop| rc2(release/1.0.1-rc2)
    rc2 --> |merge PR for featureC| dev2
    rc2 --> |merge PR for featureD| dev2
    dev2{Deploy & Test on DEV2} --> decisionB1((FAIL))
    decisionB1 --> |git checkout -b release/v1.0.2-rc2 release/v1.0.1-rc2| release/1.0.2-rc2(release/1.0.2-rc2)
    release/1.0.2-rc2 --> dev2
    dev --> |git checkout -b release/v1.0.1-rc2 develop| rc2(release/v1.0.1-rc2)
    rc2 --> |merge PR for featureC| testB1
    rc2 --> |merge PR for featureD| testB1
    testB1{Deploy & Test on DEV2} --> decisionB1((FAIL))
    decisionB1 --> |git checkout -b release/v1.0.2-rc2 release/v1.0.1-rc2| release/v1.0.2-rc2(release/v1.0.2-rc2)
    release/v1.0.2-rc2 --> testB2{Deploy & Test on DEV2}
    testB2 --> decisionB2((PASS))

    %% should w talk about rebasing with newer develop branch before cutting the release branch for staging?
    %% staging2{Deploy & Test `release/v1.0.2-rc2` on STAGING}
    %% decisionA2 --> |staging is empty & available| staging2
    %% decisionB2 --> staging2
  2. pulkitsinghal revised this gist Jul 22, 2018. 1 changed file with 2 additions and 3 deletions.
    5 changes: 2 additions & 3 deletions release-candidate.mermaid
    Original file line number Diff line number Diff line change
    @@ -17,7 +17,6 @@ uat --> decisionA3((PASS))
    dev --> |git checkout -b release/v1.0.1-rc2 develop| rc2(release/1.0.1-rc2)
    rc2 --> |merge PR for featureC| dev2
    rc2 --> |merge PR for featureD| dev2
    dev2{Deploy & Test on DEV2} --> decision2{PASS or FAIL?}
    decision2 --> |failed OR did not make it in time| create(create a new branch)
    create --> |git checkout -b release/v1.0.2-rc2 release/v1.0.2-rc1| release/1.0.2-rc2(release/1.0.2-rc2)
    dev2{Deploy & Test on DEV2} --> decisionB1((FAIL))
    decisionB1 --> |git checkout -b release/v1.0.2-rc2 release/v1.0.1-rc2| release/1.0.2-rc2(release/1.0.2-rc2)
    release/1.0.2-rc2 --> dev2
  3. pulkitsinghal revised this gist Jul 22, 2018. 1 changed file with 16 additions and 7 deletions.
    23 changes: 16 additions & 7 deletions release-candidate.mermaid
    Original file line number Diff line number Diff line change
    @@ -1,14 +1,23 @@
    graph TD
    dev(develop is at v.1.0.0)

    dev --> |git checkout -b release/v1.0.1-rc1 develop| rc1(release/1.0.1-rc1)
    dev --> |git checkout -b release/v1.0.1-rc2 develop| rc2(release/1.0.1-rc2)
    rc1 --> |merge PR for featureA| dev1
    rc1 --> |merge PR for featureB| dev1
    dev1{Deploy & Test on DEV1} --> decisionA1((PASS))
    decisionA1 --> |git checkout -b release/v1.0.1-rc1 release/v1.0.1| release1.0.1_pass1(release/v1.0.1)
    release1.0.1_pass1 --> staging{Deploy & Test on STAGING}
    staging -->decisionA2((PASS))
    decisionA2 --> release1.0.1_pass2(release/v1.0.1)
    release1.0.1_pass2 --> |git flow release finish v1.0.1| master
    release1.0.1_pass2 --> |git flow release finish v1.0.1| develop(develop is at v.1.0.1)
    master --> uat{Deploy & Test on UAT}
    uat --> decisionA3((PASS))

    dev --> |git checkout -b release/v1.0.1-rc2 develop| rc2(release/1.0.1-rc2)
    rc2 --> |merge PR for featureC| dev2
    rc2 --> |merge PR for featureD| dev2
    dev1{Deploy & Test on DEV1}
    dev2{Deploy & Test on DEV2}
    decision{first one to PASS}
    dev1 --> decision
    dev2 --> decision
    decision --> |PASS| release1.0.1(release/v1.0.1)
    dev2{Deploy & Test on DEV2} --> decision2{PASS or FAIL?}
    decision2 --> |failed OR did not make it in time| create(create a new branch)
    create --> |git checkout -b release/v1.0.2-rc2 release/v1.0.2-rc1| release/1.0.2-rc2(release/1.0.2-rc2)
    release/1.0.2-rc2 --> dev2
  4. pulkitsinghal created this gist Jul 22, 2018.
    14 changes: 14 additions & 0 deletions release-candidate.mermaid
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,14 @@
    graph TD
    dev(develop is at v.1.0.0)
    dev --> |git checkout -b release/v1.0.1-rc1 develop| rc1(release/1.0.1-rc1)
    dev --> |git checkout -b release/v1.0.1-rc2 develop| rc2(release/1.0.1-rc2)
    rc1 --> |merge PR for featureA| dev1
    rc1 --> |merge PR for featureB| dev1
    rc2 --> |merge PR for featureC| dev2
    rc2 --> |merge PR for featureD| dev2
    dev1{Deploy & Test on DEV1}
    dev2{Deploy & Test on DEV2}
    decision{first one to PASS}
    dev1 --> decision
    dev2 --> decision
    decision --> |PASS| release1.0.1(release/v1.0.1)