From b27fb85e6cba7656567b062bb000af12496b894b Mon Sep 17 00:00:00 2001 From: Bradley Hilton Date: Thu, 19 Apr 2018 23:18:27 -0400 Subject: [PATCH 1/2] Clarify the wording of the release issue template --- .github/issue-templates/release.md | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/issue-templates/release.md b/.github/issue-templates/release.md index 6918d52ab621..d8e6c10f43c2 100644 --- a/.github/issue-templates/release.md +++ b/.github/issue-templates/release.md @@ -1,16 +1,16 @@ # Release {version} We are releasing a new version, this issue will keep track of the progress between the first release candidate (20th of each month) to the final release (27th of each month). -After the 20th of each month we start the release process that ends 7 days after, during that period we enter a Feature Freeze. While in the Feature Freeze, we will only be merging bug fixes and not new features. +Beginning on the 20th of each month, we will start the release process which ends 7 days later (the 27th). During this period of time, we will enter a "Feature Freeze". This Feature Freeze means that we will only be merging pull requests which fix bugs and not ones which add new features. -For any regression, open a new issue and link to this one. +When you find a bug that is a regression, please open a new issue and link it to this one. ## Before Release - Preparation - 1 business day before the day 20th - [x] Create the issue to track the release progress -- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post -- [ ] Talk to the Marketing Team about the Blog Post release -- [ ] Talk to the Documentation Team about the Docs release +- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post (as a new comment to this issue with links to the PRs) +- [ ] Talk to the Marketing Team about starting the release Blog Post +- [ ] Talk to the Documentation Team about ensuring the Docs are up to date and all pull requests are merged - [ ] Sync translations from [LingoHub](https://translate.lingohub.com/rocketchat/rocket-dot-chat/dashboard) ## Release Candidate 1 - On the 20th @@ -19,8 +19,8 @@ For any regression, open a new issue and link to this one. - [ ] On branch `release-candidate` run `npm run release` and follow the steps - [ ] Publish the branch and the generated tag - [ ] Edit the tag on GitHub and paste the generated History removing the version from the first line and mark the checkbox **This is a pre-release** -- [ ] Ensure the build is passing on CircleCI -- [ ] Ensure the build is passing on Docker Hub +- [ ] Ensure the build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat) +- [ ] Ensure the build is passing on [Docker Hub](https://hub.docker.com/r/rocketchat/rocket.chat/builds/) ## Final Release - On the 27th @@ -44,16 +44,18 @@ For any regression, open a new issue and link to this one. - [ ] Paste the history removing the version from the first line - [ ] Save as **draft** - [ ] Create a PR from the branch `release-{version}` with the same history from the tag/release -- [ ] Ensure the build is passing on CircleCI -- [ ] Ensure the build is passing on Docker Hub +- [ ] Ensure the build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat) +- [ ] Ensure the build is passing on [Docker Hub](https://hub.docker.com/r/rocketchat/rocket.chat/builds/) - [ ] When build is passing ask for approval - [ ] When approved merge it! - [ ] When merged edit the release/tag and publish it ## After Release - Conclusion - 1 business day after the 27th -- [ ] Check if related issues was closed -- [ ] Check if related issues was assigned to the correct milestone -- [ ] Check with the Marketing Team about the Blog Post release +- [ ] Ensure all of the related issues were closed +- [ ] Determine if all of the related issues were correctly assigned to the this version's milestone +- [ ] Get an update from Marketing Team about the release Blog Post - [ ] Check with the Documentation Team about the Docs release -- [ ] Create a Sync PR to merge back master to develop +- [ ] Create a Sync PR to merge `master` back into `develop` +- [ ] Ensure the build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat) +- [ ] When build has passed, ask for approval and wait - [ ] Merge Sync PR From 0ffd51a50e441375eae6f0637eb7cd9a5e1c58e6 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 22 May 2018 09:53:32 -0300 Subject: [PATCH 2/2] Update release.md --- .github/issue-templates/release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/issue-templates/release.md b/.github/issue-templates/release.md index d8e6c10f43c2..f5691b238f12 100644 --- a/.github/issue-templates/release.md +++ b/.github/issue-templates/release.md @@ -8,7 +8,7 @@ When you find a bug that is a regression, please open a new issue and link it to ## Before Release - Preparation - 1 business day before the day 20th - [x] Create the issue to track the release progress -- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post (as a new comment to this issue with links to the PRs) +- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post - [ ] Talk to the Marketing Team about starting the release Blog Post - [ ] Talk to the Documentation Team about ensuring the Docs are up to date and all pull requests are merged - [ ] Sync translations from [LingoHub](https://translate.lingohub.com/rocketchat/rocket-dot-chat/dashboard)