release-5.32
) will be cut once the Mattermost Cloud release that will be used for the next self-managed release has been shipped.master
branch into the cloud
branchcloud
branch is deleted and a new one is created from the master
branch for each. A backup of the cloud
branches are saved. This is done biweekly on a Monday by the Release Manager via an automated process. See this document for more details on the process.master
branch is merged into a cloud
branch in order to be mindful of avoiding having incomplete features in a Cloud release, and to include bug fixes that we may want to include in a release.cloud-2021-01-26
tag).Cherry-pick Approved
label and self-managed milestone on the PR. Cloud doesn't have a specific milestone in GitHub and the PRs can be tracked via the Cherry-pick Approved
label. The Release Manager keeps track of PRs with the Cherry-pick Approved
label and self-managed milestone on a daily basis.cloud
branch (based off of master
) is used, and any regression bug fixes for the next Cloud release will be cherry-picked there. This applies to webapp/server/Enterprise repos.cloud-2021-01-26
release tag. Currently the cadence is that the Mattermost Cloud release shipped in the last week of a month will become the next self-managed release. The release branch for a self-managed release will be cut once the Mattermost Cloud release that will be used for the next self-managed release has been shipped.master
branch and they update daily.master
and release
branches.master
. The dev reviewer is responsible for helping cherry-picking it to the release
branch.release
branch, e.g., https://github.com/mattermost/mattermost-server/commits/release-5.4 contains commits that shipped with mattermost-server v5.4
. Jira ticket is resolved after cherry picking is done.release
branch as needed.master
.