Last active
March 12, 2020 17:46
-
-
Save madchap/7bee5af2c1f9ce7e326ce8d8ae28d644 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@startuml | |
!pragma teoz true | |
== Release == | |
participant "Dev branch" as devbranch order 10 #LightBlue | |
participant "RC branch" as rcbranch order 20 #YellowGreen | |
participant "Master branch" as master order 30 #99FF99 | |
participant "Hotfix branch" as hotbranch order 40 #DarkSalmon | |
{startrc} devbranch -> rcbranch ++ #YellowGreen: Start release | |
note left of devbranch | |
Evolutions | |
end note | |
rcbranch --> devbranch: Merge back bug fixes | |
rcbranch --> devbranch: Merge back more bug fixes | |
rcbranch -> master: Merge | |
note right of master | |
New release | |
- Tag | |
- Deploy to DockerHub | |
end note | |
{endrc} rcbranch --> devbranch --: Release done | |
devbranch -> rcbranch: Start new release | |
... ... | |
{startrc} <-> {endrc}: 4 weeks | |
== Hotfix == | |
master -> hotbranch ++ #DarkSalmon: Create short-lived fix branch | |
note right of hotbranch | |
Severe bug | |
to be corrected | |
end note | |
hotbranch -> master: Merge | |
hotbranch -> rcbranch: Backport | |
hotbranch -> devbranch --: Backport | |
@enduml |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment