Skip to content

Instantly share code, notes, and snippets.

@ricog

ricog/deployment-workflow.md

Last active December 18, 2015 15:58
Download ZIP

Revisions

  1. ricog revised this gist Jun 18, 2013. 1 changed file with 2 additions and 2 deletions.
    4 changes: 2 additions & 2 deletions deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -4,8 +4,8 @@ Below is a branching strategy using rebase that maintains a deployable master br

    * master - always deployable to production
    * staging - stable code base ready for pre-production testing, also the feature branch merge target
    * feature - testable in development environments, only merged to staging once stable and ready to deploy
    * patch/fix - urgent items that need applied to master branch ahead of staging and feature branches
    * features - one branch per feature, testable in development environments, only merged to staging once stable and ready to deploy
    * patches - one branch per patch, urgent items that need applied to master branch ahead of staging and feature branches

    Feature branches are agressively rebased on the staging branch by the feature developer. After completed, tested, and signed off (by at least one other developer), the feature branch is merged into staging for final testing. Patch/fix branches are derived from master and rebased if necessary before merging back in.

  2. ricog revised this gist Jun 18, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,6 +1,6 @@
    Below is a branching strategy using rebase that maintains a deployable master branch and stable staging branch for quality assurance testing.

    ##Branch Concepts
    ###Branch Concepts

    * master - always deployable to production
    * staging - stable code base ready for pre-production testing, also the feature branch merge target
  3. ricog revised this gist Jun 18, 2013. 1 changed file with 12 additions and 0 deletions.
    12 changes: 12 additions & 0 deletions deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,3 +1,15 @@
    Below is a branching strategy using rebase that maintains a deployable master branch and stable staging branch for quality assurance testing.

    ##Branch Concepts

    * master - always deployable to production
    * staging - stable code base ready for pre-production testing, also the feature branch merge target
    * feature - testable in development environments, only merged to staging once stable and ready to deploy
    * patch/fix - urgent items that need applied to master branch ahead of staging and feature branches

    Feature branches are agressively rebased on the staging branch by the feature developer. After completed, tested, and signed off (by at least one other developer), the feature branch is merged into staging for final testing. Patch/fix branches are derived from master and rebased if necessary before merging back in.


    Start with Master and Staging at same commit

    M/S
  4. ricog revised this gist Jun 18, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -56,7 +56,7 @@ Another completed feature is rebased on Staging
    ----------------------M/p1----S/f2


    Rebased feature branche is then merged into Staging
    Rebased feature branch is then merged into Staging

    ----------------------M/p1----f2------S/f1

  5. ricog revised this gist Jun 18, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -56,7 +56,7 @@ Another completed feature is rebased on Staging
    ----------------------M/p1----S/f2


    Rebased feature branches are merged into Staging
    Rebased feature branche is then merged into Staging

    ----------------------M/p1----f2------S/f1

  6. ricog revised this gist Jun 18, 2013. 1 changed file with 6 additions and 6 deletions.
    12 changes: 6 additions & 6 deletions deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -51,21 +51,21 @@ Staging is then rebased on master again

    Another completed feature is rebased on Staging

    ----f1
    /
    ----------------------M/p1----f2----S
    ----f1
    /
    ----------------------M/p1----S/f2


    Rebased feature branches are merged into Staging

    ----------------------M/p1----f2----------S/f1
    ----------------------M/p1----f2------S/f1


    Master branch is fast-forward merged to stable position on Staging branch

    ----------------------p1------f2----------M/S/f1
    ----------------------p1------f2------M/S/f1


    Cycle starts over with Master and Staging on same commit

    ------------------------------------------M/S
    --------------------------------------M/S
  7. ricog revised this gist Jun 18, 2013. 1 changed file with 26 additions and 19 deletions.
    45 changes: 26 additions & 19 deletions deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -6,59 +6,66 @@ Start with Master and Staging at same commit

    Developers create feature branches from Staging

    -------f1
    /
    ----f1
    /
    M/S

    -------f1
    /
    ----f1
    /
    M/S
    \
    -------------f2
    \
    ---------f2


    Completed features are rebased on Staging and then merged in

    -------f1
    ----f1
    /
    M--------------S/f2
    M------------S/f2


    Patches are created as a new branch from Master

    -------f1
    ----f1
    /
    M--------------S/f2
    M-----------S/f2
    \
    --------------------p1
    -----------------p1


    Completed patches are rebased on master if needed and then merged in

    -------f1
    ----f1
    /
    ----------------------M/p1
    -------------------M/p1
    \
    ------------S/f2
    --------S/f2


    Staging is then rebased on master again

    -------f1
    ----f1
    /
    ----------------------M/p1----S/f2


    More completed features are rebased on Staging and then merged in
    Another completed feature is rebased on Staging

    ----f1
    /
    ----------------------M/p1----f2----S


    Rebased feature branches are merged into Staging

    ----------------------M/p1----f2----S/f1
    ----------------------M/p1----f2----------S/f1


    Master branch is fast-forward merged to stable position on Staging branch

    ----------------------p1------f2----M/S/f1
    ----------------------p1------f2----------M/S/f1


    Cycle starts over with Master and Staging on same commit

    --------------------------------------M/S
    ------------------------------------------M/S
  8. ricog revised this gist Jun 18, 2013. 1 changed file with 9 additions and 0 deletions.
    9 changes: 9 additions & 0 deletions deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,9 +1,11 @@
    Start with Master and Staging at same commit

    M/S



    Developers create feature branches from Staging

    -------f1
    /
    M/S
    @@ -16,12 +18,14 @@ Developers create feature branches from Staging


    Completed features are rebased on Staging and then merged in

    -------f1
    /
    M--------------S/f2


    Patches are created as a new branch from Master

    -------f1
    /
    M--------------S/f2
    @@ -30,6 +34,7 @@ Patches are created as a new branch from Master


    Completed patches are rebased on master if needed and then merged in

    -------f1
    /
    ----------------------M/p1
    @@ -38,18 +43,22 @@ Completed patches are rebased on master if needed and then merged in


    Staging is then rebased on master again

    -------f1
    /
    ----------------------M/p1----S/f2


    More completed features are rebased on Staging and then merged in

    ----------------------M/p1----f2----S/f1


    Master branch is fast-forward merged to stable position on Staging branch

    ----------------------p1------f2----M/S/f1


    Cycle starts over with Master and Staging on same commit

    --------------------------------------M/S
  9. ricog revised this gist Jun 18, 2013. 1 changed file with 0 additions and 1 deletion.
    1 change: 0 additions & 1 deletion deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,3 @@

    Start with Master and Staging at same commit
    M/S

  10. ricog created this gist Jun 18, 2013.
    56 changes: 56 additions & 0 deletions deployment-workflow.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,56 @@

    Start with Master and Staging at same commit
    M/S



    Developers create feature branches from Staging
    -------f1
    /
    M/S

    -------f1
    /
    M/S
    \
    -------------f2


    Completed features are rebased on Staging and then merged in
    -------f1
    /
    M--------------S/f2


    Patches are created as a new branch from Master
    -------f1
    /
    M--------------S/f2
    \
    --------------------p1


    Completed patches are rebased on master if needed and then merged in
    -------f1
    /
    ----------------------M/p1
    \
    ------------S/f2


    Staging is then rebased on master again
    -------f1
    /
    ----------------------M/p1----S/f2


    More completed features are rebased on Staging and then merged in
    ----------------------M/p1----f2----S/f1


    Master branch is fast-forward merged to stable position on Staging branch
    ----------------------p1------f2----M/S/f1


    Cycle starts over with Master and Staging on same commit
    --------------------------------------M/S