Release flows

Start

Follow the tree to the flow that fits the situation. Every branch is shown; open the flow at the end of it.

Goal

Release product1 1.5.0 from the trunk, without shipping product2's unfinished work.

Release steps

1An operator queues bump, which creates the rc tag
2An operator queues deploy, which builds and deploys to QA
3An operator checks the release on QA
3.1An operator finds a bug on QA
⋮
3.2An operator makes a fix branch from the trunk and commits the fix
3.3The pull request is merged, and ci validates the fix
3.4An operator queues bump, which continues the rc line
3.5An operator queues deploy, which builds and deploys the fix to QA
3.6The operator confirms the fix on QA
4An operator queues release for product1, which derives the final version
5The approver approves the release
6release creates the final tag and promotes the candidate
7An operator confirms the release on Production

Commit

Environments

Author

SHA

product1-v1.5.0-rc product1 stage tag product2-v3.1.0-rc product2 stage tag product1-v1.5.0 planned version, no tag yet product1-v1.5.0 filled tag means released product1 · QA environment validated and confirmed product1 · Production environment deployed, not validated yet feature branch, squashed into the candidate commit

Goal

Put the previous release back on production, without writing code and without making a release.

Commit

Environments

Author

SHA

product1-v1.5.0 the broken release product1-v1.4.2 the previous release, deployed again product1 · Production environment validated and confirmed product1 · Production environment deployed, not validated yet

Goal

Put a beta tag on DEV and check it, without making a release.

Deploy steps

1A feature branch is ready to merge
2ci validates the trunk
2.1ci fails on the trunk
⋮
2.2An operator makes a fix branch from the trunk and commits the fix
2.3The pull request is merged, and ci validates the fix
3An operator queues bump, which creates the beta tag
4An operator queues deploy, which builds and deploys to DEV
5An operator checks the release on DEV
5.1The operator finds an issue on DEV
⋮
5.2An operator makes a fix branch from the trunk and commits the fix
5.3The pull request is merged, and ci validates the fix
5.4An operator queues bump, which continues the beta line
5.5An operator queues deploy, which builds and deploys the fix to DEV
5.6The operator confirms the fix on DEV

Commit

Environments

Author

SHA

product1-v1.5.0-beta product1 beta tag product1 · DEV environment validated and confirmed product1 · DEV environment deployed, not validated yet fix branch, squashed into the trunk

Goal

Fix a broken release from the trunk, without shipping unfinished work.

Hotfix steps

1An operator finds an issue on production
2An operator makes a hotfix branch from the trunk and commits the fix
3The pull request is merged, and ci validates every product
4An operator queues bump, which creates the patch candidate tag
5An operator queues deploy, which builds and deploys to QA
6An operator checks the fix on QA
6.1An operator finds another issue on QA
⋮
6.2An operator makes a fix branch from the trunk and commits the fix
6.3The pull request is merged, and ci validates the fix
6.4An operator queues bump, which continues the rc line
6.5An operator queues deploy, which builds and deploys the fix to QA
6.6The operator confirms the fix on QA
7An operator queues release, which derives the final version
8The approver approves the release
9release tags and promotes
10An operator confirms the release on Production

Commit

Environments

Author

SHA

product1-v1.5.1-rc patch candidate tag product1-v1.5.1 planned version, no tag yet product1-v1.5.1 filled tag means released product1 · QA environment validated and confirmed product1 · Production environment deployed, not validated yet hotfix branch, squashed into the trunk

Goal

Fix a broken release from its tag, without shipping the trunk work that must not reach customers.

Hotfix steps

1An operator finds an issue on production
2An operator makes a fix branch from the trunk and commits the fix
3The pull request is merged, and ci validates the fix on the trunk
4An operator makes a release branch from the released tag and cherry-picks the fix onto it
5An operator queues bump, which creates the patch candidate tag on the release branch
6An operator queues deploy, which builds and deploys to QA
7An operator checks the fix on QA
7.1An operator finds an issue on QA
⋮
7.2An operator makes a fix branch from the trunk and commits the fix
7.3The pull request is merged, and ci validates the fix on the trunk
7.4An operator cherry-picks the fix onto the release branch
7.5An operator queues bump, which continues the rc line
7.6An operator queues deploy, which builds and deploys the fix to QA
7.7The operator confirms the fix on QA
8An operator queues release, which derives the final version
9The approver approves the release
10release tags and promotes
11An operator confirms the release on Production
12An operator deletes the release branch

Commit

Environments

Author

SHA

product1-v1.5.1-rc patch candidate tag product1-v1.5.1 planned version, no tag yet product1-v1.5.1 filled tag means released product1 · QA environment validated and confirmed product1 · Production environment deployed, not validated yet release branch, cut from the released tag