Skip to content

Commit 4cd2186

Browse files
authored
Update release plan for release/master workflow
1 parent 27cfdd3 commit 4cd2186

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

.github/release_plan.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
# Release candidate (Monday before release)
1818

19-
- [ ] Announce feature freeze
2019
- [ ] Ensure all new feature usages are tracked via telemetry
2120
- [ ] Update the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json)
2221
- [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) is up-to-date
@@ -37,7 +36,7 @@
3736
# Final (near a VS Code release)
3837

3938
## Preparation
40-
[Final PR should be against the `release` branch and then cherrypicked into `master`]
39+
[Final PR should be against the `release` branch]
4140

4241
- [ ] Make sure the [appropriate pull requests](https://github.com/microsoft/vscode-docs/pulls) for the [documentation](https://code.visualstudio.com/docs/python/python-tutorial) -- including the [WOW](https://code.visualstudio.com/docs/languages/python) page -- are ready
4342
- [ ] Update the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json)
@@ -61,10 +60,10 @@
6160
- [ ] Publish the [blog](http://aka.ms/pythonblog) post
6261
- [ ] Create a [release](https://github.com/Microsoft/vscode-python/releases) on GitHub (which creates an appropriate git tag)
6362
- [ ] Determine if a hotfix is needed
63+
- [ ] Merge `release` back into `master`
6464

6565
## Prep for the _next_ release
6666
- [ ] Bump the [version](https://github.com/Microsoft/vscode-python/blob/master/package.json) number to the next `alpha`
67-
- [ ] Lift the feature freeze
6867
- [ ] Create a new [release plan](https://github.com/Microsoft/vscode-python/edit/master/.github/release_plan.md)
6968

7069
## Clean up after _this_ release

0 commit comments

Comments
 (0)