Skip to content

Commit

Permalink
Remove uses of "master" (#13646)
Browse files Browse the repository at this point in the history
  • Loading branch information
brettcannon authored Sep 3, 2020
1 parent 2acf014 commit fb797a3
Show file tree
Hide file tree
Showing 21 changed files with 88 additions and 98 deletions.
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ For #

- [ ] Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
- [ ] Title summarizes what is changing.
- [ ] Has a [news entry](https://github.com/Microsoft/vscode-python/tree/master/news) file (remember to thank yourself!).
- [ ] Has a [news entry](https://github.com/Microsoft/vscode-python/tree/main/news) file (remember to thank yourself!).
- [ ] Appropriate comments and documentation strings in the code.
- [ ] Has sufficient logging.
- [ ] Has telemetry for enhancements.
- [ ] Unit tests & system/integration tests are added/updated.
- [ ] [Test plan](https://github.com/Microsoft/vscode-python/blob/master/.github/test_plan.md) is updated as appropriate.
- [ ] [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package-lock.json) has been regenerated by running `npm install` (if dependencies have changed).
- [ ] [Test plan](https://github.com/Microsoft/vscode-python/blob/main/.github/test_plan.md) is updated as appropriate.
- [ ] [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package-lock.json) has been regenerated by running `npm install` (if dependencies have changed).
- [ ] The wiki is updated with any design decisions/details.
52 changes: 26 additions & 26 deletions .github/release_plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
# Release candidate (Monday, XXX XX)

- [ ] Announce the code 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.
- [ ] Update master for the release
- [ ] Create a branch against `master` for a pull request
- [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) from a `-dev` suffix to `-rc` (🤖)
- [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) is up-to-date (🤖)
- [ ] Update `main` for the release
- [ ] Create a branch against `main` for a pull request
- [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) from a `-dev` suffix 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 (🤖)
- [ ] Extension will pick up latest version of `debugpy`. If you need to pin to a particular version see `install_debugpy.py`.
- [ ] Update `languageServerVersion` in `package.json` to point to the latest version of the [Language Server](https://github.com/Microsoft/python-language-server). Check with the language server team if this needs updating.
- [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/master/CHANGELOG.md) (🤖)
- [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/master/news) (typically `python news --final --update CHANGELOG.md | code-insiders -`)
- [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/main/CHANGELOG.md) (🤖)
- [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/main/news) (typically `python news --final --update CHANGELOG.md | code-insiders -`)
- [ ] Copy over the "Thanks" section from the previous release into the "Thanks" section for the new release
- [ ] Make sure the "Thanks" section is up-to-date (e.g. compare to versions in [`requirements.txt`](https://github.com/microsoft/vscode-python/blob/master/requirements.txt))
- [ ] Make sure the "Thanks" section is up-to-date (e.g. compare to versions in [`requirements.txt`](https://github.com/microsoft/vscode-python/blob/main/requirements.txt))
- [ ] Touch up news entries (e.g. add missing periods)
- [ ] Check the Markdown rendering to make sure everything looks good
- [ ] Add any relevant news entries for `debugpy` and the language server if they were updated
- [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (Notes for this process are in the Team OneNote under Python VS Code -> Dev Process -> Third-Party Notices / TPN file)
- [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Repository.txt) as appropriate. This file is manually edited so you can check with the teams if anything needs to be added here.
- [ ] Create a pull request against `master` (🤖)
- [ ] Merge pull request into `master`
- [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (Notes for this process are in the Team OneNote under Python VS Code -> Dev Process -> Third-Party Notices / TPN file)
- [ ] 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.
- [ ] Create a pull request against `main` (🤖)
- [ ] Merge pull request into `main`
- [ ] Update the [`release` branch](https://github.com/microsoft/vscode-python/branches)
- [ ] If there are `release` branches that are two versions old (e.g. release-2020.[current month - 2]) you can delete them at this time
- [ ] Create a new `release-YYYY.MM` branch from `master`
- [ ] Update master post-release (🤖)
- [ ] Bump the version number to the next monthly ("YYYY.MM.0-dev") release in the `master` branch
- [ ] Create a new `release-YYYY.MM` branch from `main`
- [ ] Update `main` post-release (🤖)
- [ ] Bump the version number to the next monthly ("YYYY.MM.0-dev") release in the `main` branch
- [ ] `package.json`
- [ ] `package-lock.json`
- [ ] Create a pull request against `master`
- [ ] Merge pull request into `master`
- [ ] Create a pull request against `main`
- [ ] Merge pull request into `main`
- [ ] Announce the code freeze is over on the same channels
- [ ] Update [Component Governance](https://dev.azure.com/ms/vscode-python/_componentGovernance) (Click on "microsoft/vscode-python" on that page). Notes are in the OneNote under Python VS Code -> Dev Process -> Component Governance.
- [ ] Provide details for any automatically detected npm dependencies
Expand All @@ -52,22 +52,22 @@
- [ ] 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
- [ ] Final updates to the `release-YYYY.MM` branch
- [ ] Create a branch against `release-YYYY.MM` for a pull request
- [ ] Update the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) to remove the `-rc` (🤖)
- [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) is up-to-date (the only update should be the version number if `package-lock.json` has been kept up-to-date) (🤖)
- [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/master/CHANGELOG.md) (🤖)
- [ ] Update the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) to remove the `-rc` (🤖)
- [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) is up-to-date (the only update should be the version number if `package-lock.json` has been kept up-to-date) (🤖)
- [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/main/CHANGELOG.md) (🤖)
- [ ] Update version and date for the release section
- [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/master/news) and copy-and-paste new entries (typically `python news --final | code-insiders -`; quite possibly nothing new to add)
- [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (🤖; see team notes)
- [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Repository.txt) manually if necessary
- [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/main/news) and copy-and-paste new entries (typically `python news --final | code-insiders -`; quite possibly nothing new to add)
- [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (🤖; see team notes)
- [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Repository.txt) manually if necessary
- [ ] Create pull request against `release-YYYY.MM` (🤖)
- [ ] Merge pull request into `release-YYYY.MM`
- [ ] Make sure component governance is happy

## Release

- [ ] Publish the release via Azure DevOps
- [ ] Make sure [CI](https://github.com/Microsoft/vscode-python/blob/master/CONTRIBUTING.md) is passing. Try a re-run on any failing CI test stages. If tests still won't pass contact the owning team.
- [ ] On Azure DevOps on the page for the CI run after it succeeds there will now be a "Releases" tab which is populated with a release entry. Click that entry to go to the release page, which shows the "Upload" and "Publish" stages
- [ ] Make sure [CI](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md) is passing. Try a re-run on any failing CI test stages. If tests still won't pass contact the owning team.
- [ ] On Azure DevOps on the page for the CI run after it succeeds there will now be a "Releases" tab which is populated with a release entry. Click that entry to go to the release page, which shows the "Upload" and "Publish" stages
- [ ] Click the deploy button on the "Upload" stage and make sure that it succeeds
- [ ] Make sure no extraneous files are being included in the `.vsix` file (make sure to check for hidden files)
- [ ] Click the deploy button on the "Publish" stage, this will push out the release to the public
Expand All @@ -79,7 +79,7 @@
- [ ] Publish [documentation changes](https://github.com/Microsoft/vscode-docs/pulls?q=is%3Apr+is%3Aopen+label%3Apython)
- [ ] Publish the [blog](http://aka.ms/pythonblog) post
- [ ] Determine if a hotfix is needed
- [ ] Merge `release-YYYY.MM` back into `master`. Don't overwrite the master `-dev` version in package.json. (🤖)
- [ ] Merge `release-YYYY.MM` back into `main`. Don't overwrite the `-dev` version in package.json. (🤖)

## Clean up after _this_ release

Expand All @@ -88,5 +88,5 @@

## Prep for the _next_ release

- [ ] Create a new [release plan](https://raw.githubusercontent.com/microsoft/vscode-python/master/.github/release_plan.md) (🤖)
- [ ] Create a new [release plan](https://raw.githubusercontent.com/microsoft/vscode-python/main/.github/release_plan.md) (🤖)
- [ ] [(Un-)pin](https://help.github.com/en/articles/pinning-an-issue-to-your-repository) [release plan issues](https://github.com/Microsoft/vscode-python/labels/release%20plan) (🤖)
2 changes: 1 addition & 1 deletion .github/test_plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def foo():pass

### [Debugging](https://code.visualstudio.com/docs/python/debugging)

- [ ] [Configurations](https://code.visualstudio.com/docs/python/debugging#_debugging-specific-app-types) work (see [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) and the `"configurationSnippets"` section for all of the possible configurations)
- [ ] [Configurations](https://code.visualstudio.com/docs/python/debugging#_debugging-specific-app-types) work (see [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) and the `"configurationSnippets"` section for all of the possible configurations)
- [ ] Running code from start to finish w/ no special debugging options (e.g. no breakpoints)
- [ ] Breakpoint-like things
- [ ] Breakpoint
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/insiders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Insiders Build
on:
push:
branches:
- master
- main

env:
Expand Down
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2872,7 +2872,7 @@ part of!
([#7376](https://github.com/Microsoft/vscode-python/issues/7376))
1. Refactor Azure Pipelines to use stages.
([#7431](https://github.com/Microsoft/vscode-python/issues/7431))
1. Add unit tests to guarantee that the extension version in the master branch has the '-dev' suffix.
1. Add unit tests to guarantee that the extension version in the main branch has the '-dev' suffix.
([#7471](https://github.com/Microsoft/vscode-python/issues/7471))
1. Add a smoke test for the `Interactive Window`.
([#7653](https://github.com/Microsoft/vscode-python/issues/7653))
Expand Down Expand Up @@ -4947,7 +4947,7 @@ part of!
([#3317](https://github.com/Microsoft/vscode-python/issues/3317))
1. Add YAML file specification for CI builds
([#3350](https://github.com/Microsoft/vscode-python/issues/3350))
1. Stop running CI tests against the `master` branch of ptvsd.
1. Stop running CI tests against the `main` branch of ptvsd.
([#3414](https://github.com/Microsoft/vscode-python/issues/3414))
1. Be more aggressive in searching for a Python environment that can run Jupyter
(make sure to cleanup any kernelspecs that are created during this process).
Expand Down Expand Up @@ -5818,7 +5818,7 @@ nearly as feature-rich and useful as it is.
([#1703](https://github.com/Microsoft/vscode-python/issues/1703))
1. Update debug capabilities to add support for the setting `supportTerminateDebuggee` due to an upstream update from [PTVSD](https://github.com/Microsoft/ptvsd/issues).
([#1719](https://github.com/Microsoft/vscode-python/issues/1719))
1. Build and upload development build of the extension to the Azure blob store even if CI tests fail on the `master` branch.
1. Build and upload development build of the extension to the Azure blob store even if CI tests fail on the `main` branch.
([#1730](https://github.com/Microsoft/vscode-python/issues/1730))
1. Changes to the script used to upload the extension to the Azure blob store.
([#1732](https://github.com/Microsoft/vscode-python/issues/1732))
Expand Down Expand Up @@ -5948,7 +5948,7 @@ his help on [our issue tracker](https://github.com/Microsoft/vscode-python)!
([#1216](https://github.com/Microsoft/vscode-python/issues/1216))
1. Parallelize jobs (unit tests) on CI server.
([#1247](https://github.com/Microsoft/vscode-python/issues/1247))
1. Run CI tests against the release version and master branch of PTVSD (experimental debugger), allowing tests to fail against the master branch of PTVSD.
1. Run CI tests against the release version and main branch of PTVSD (experimental debugger), allowing tests to fail against the main branch of PTVSD.
([#1253](https://github.com/Microsoft/vscode-python/issues/1253))
1. Only trigger the extension for `file` and `untitled` in preparation for
[Visual Studio Live Share](https://aka.ms/vsls)
Expand Down
Loading

0 comments on commit fb797a3

Please sign in to comment.