From 1907b84222017ba61a5188ccdc4910b23ea6fc14 Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Tue, 4 Oct 2022 11:04:12 -0700 Subject: [PATCH 1/4] fixing-git --- .github/release_plan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release_plan.md b/.github/release_plan.md index 28f746d93252..b00d15fb8128 100644 --- a/.github/release_plan.md +++ b/.github/release_plan.md @@ -2,7 +2,7 @@ All dates should align with VS Code's [iteration](https://github.com/microsoft/v # Feature freeze (Monday @ 17:00 America/Vancouver, XXX XX) -- [ ] Announce the feature freeze on both Teams and e-mail, leave enough time for teams to surface any last minute issues that need to get in before freeze. Make sure debugger and Language Server teams are looped in as well. +- [ ] Announce the feature freeze on both Teams and e-mail if needed, leave enough time for teams to surface any last minute issues that need to get in before freeze. Make sure debugger and Language Server teams are looped in as well. # Release candidate (Monday, XXX XX) From 102ff09c653b9929e3f5fd6e08cd69951e36d8e9 Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Tue, 4 Oct 2022 11:48:51 -0700 Subject: [PATCH 2/4] adding notes to release plan --- .github/release_plan.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/release_plan.md b/.github/release_plan.md index b00d15fb8128..3fb925db1e7e 100644 --- a/.github/release_plan.md +++ b/.github/release_plan.md @@ -9,7 +9,7 @@ All dates should align with VS Code's [iteration](https://github.com/microsoft/v NOTE: Third Party Notices are automatically added by our build pipelines using https://tools.opensource.microsoft.com/notice. - [ ] Update `main` for the release - - [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) to the next **even** number (🤖) + - [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) to the next **even** number and switch the `-dev` to `-rc` (🤖) - [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) is up-to-date (🤖) - [ ] Check `pypi.org` and update the version of `debugpy` in `install_debugpy.py` if necessary. - [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Repository.txt) as appropriate. This file is manually edited so you can check with the teams if anything needs to be added here. @@ -19,7 +19,7 @@ NOTE: Third Party Notices are automatically added by our build pipelines using h - [ ] Create a new `release/YYYY.minor` branch from `main` - [ ] Create a draft [GitHub release](https://github.com/microsoft/vscode-python/releases) for the release notes (🤖) - [ ] Update `main` post-release (🤖) - - [ ] Bump the minor version number to the next ("YYYY.[minor+1]") release in the `main` branch to an **odd** number (🤖) + - [ ] Bump the minor version number to the next ("YYYY.[minor+1]") release in the `main` branch to an **odd** number and switch the `-rc` to `-dev`(🤖) - [ ] `package.json` - [ ] `package-lock.json` - [ ] Create a pull request against `main` From 0272019fe4757b5e2d29d734c21d50047db9c3d2 Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Tue, 4 Oct 2022 12:32:07 -0700 Subject: [PATCH 3/4] add detail release notes --- .github/release_plan.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/release_plan.md b/.github/release_plan.md index 3fb925db1e7e..83d36f5a2efd 100644 --- a/.github/release_plan.md +++ b/.github/release_plan.md @@ -2,7 +2,7 @@ All dates should align with VS Code's [iteration](https://github.com/microsoft/v # Feature freeze (Monday @ 17:00 America/Vancouver, XXX XX) -- [ ] Announce the feature freeze on both Teams and e-mail if needed, leave enough time for teams to surface any last minute issues that need to get in before freeze. Make sure debugger and Language Server teams are looped in as well. +- [ ] Announce the feature freeze on both Teams and e-mail, leave enough time for teams to surface any last minute issues that need to get in before freeze. Make sure debugger and Language Server teams are looped in as well. # Release candidate (Monday, XXX XX) @@ -10,22 +10,24 @@ NOTE: Third Party Notices are automatically added by our build pipelines using h - [ ] Update `main` for the release - [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) to the next **even** number and switch the `-dev` to `-rc` (🤖) - - [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) is up-to-date (🤖) - - [ ] Check `pypi.org` and update the version of `debugpy` in `install_debugpy.py` if necessary. + - [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) is up-to-date, you should now see changes to the`package.json` and `package-lock.json` (🤖) + - [ ] Check [`pypi.org`](https://pypi.org/search/?q=debugpy) and update the version of `debugpy` in `install_debugpy.py` if necessary. - [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Repository.txt) as appropriate. This file is manually edited so you can check with the teams if anything needs to be added here. - - [ ] Merge pull request into `main` + - [ ] Get approval on PR then merge pull request into `main` - [ ] Create the [`release` branch](https://github.com/microsoft/vscode-python/branches) - [ ] If there are `release` branches that are two versions old you can delete them at this time - - [ ] Create a new `release/YYYY.minor` branch from `main` + - [ ] Click `draft new release` then create a tag for this release matching the `release/YYYY.XX` format + - [ ] Click `generate release notes` + - [ ] Create a new `release/YYYY.XX` branch from `main` - [ ] Create a draft [GitHub release](https://github.com/microsoft/vscode-python/releases) for the release notes (🤖) - [ ] Update `main` post-release (🤖) - [ ] Bump the minor version number to the next ("YYYY.[minor+1]") release in the `main` branch to an **odd** number and switch the `-rc` to `-dev`(🤖) - - [ ] `package.json` - - [ ] `package-lock.json` + - [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) is up-to-date, you should now see changes to the`package.json` and `package-lock.json` (🤖) - [ ] Create a pull request against `main` - - [ ] Merge pull request into `main` -- [ ] Announce the code freeze is over on the same channels + - [ ] Get approval on PR then merge pull request into `main` +- [ ] Announce the code freeze is over on the same channels, not required if this occurs on normal release cadence - [ ] Update Component Governance (Notes are in the team OneNote under Python VS Code → Dev Process → Component Governance). + - [ ] Check pipeline on Azure DevOps under [`monacotools/Monaco/Compliance/Component Governance`](https://dev.azure.com/monacotools/Monaco/_componentGovernance/192726?_a=alerts&typeId=11825783&alerts-view-option=active) - [ ] Make sure there are no active alerts - [ ] Manually add any repository/embedded/CG-incompatible dependencies - [ ] Open appropriate [documentation issues](https://github.com/microsoft/vscode-docs/issues?q=is%3Aissue+is%3Aopen+label%3Apython) From 48e39d1d73bea71dc21ad601cefa59ffdb3e82ec Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Mon, 10 Oct 2022 10:18:42 -0700 Subject: [PATCH 4/4] add vs code check --- .github/release_plan.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/release_plan.md b/.github/release_plan.md index 83d36f5a2efd..095c6f8aed93 100644 --- a/.github/release_plan.md +++ b/.github/release_plan.md @@ -50,6 +50,7 @@ NOTE: Third Party Notices are automatically added by our build pipelines using h - [ ] Make sure [CI](https://github.com/microsoft/vscode-python/actions?query=workflow:%22Build%22) is passing for Release branch (🤖). - [ ] Run the [CD](https://dev.azure.com/monacotools/Monaco/_build?definitionId=299) pipeline on the `release/yyyy.minor` branch. +- [ ] Check to ensure VS Code release has gone out before moving onto publishing the python extension - [ ] Press the approve button if everything looks good to publish to market place. - [ ] Create a [GitHub release](https://github.com/microsoft/vscode-python/releases) (🤖) - [ ] Update the release notes