docs(contributing): update updating vscode

This commit is contained in:
Joe Previte 2021-02-26 15:45:58 -07:00
parent 9ea18636d7
commit 019fe3c270
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 19 additions and 14 deletions

View File

@ -2,10 +2,12 @@
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
# Contributing # Contributing
- [Contributing](#contributing)
- [Pull Requests](#pull-requests) - [Pull Requests](#pull-requests)
- [Requirements](#requirements) - [Requirements](#requirements)
- [Development Workflow](#development-workflow) - [Development Workflow](#development-workflow)
- [Updating VS Code](#updating-vs-code) - [Updating VS Code](#updating-vs-code)
- [Notes about Changes](#notes-about-changes)
- [Build](#build) - [Build](#build)
- [Structure](#structure) - [Structure](#structure)
- [Modifications to VS Code](#modifications-to-vs-code) - [Modifications to VS Code](#modifications-to-vs-code)
@ -59,14 +61,17 @@ To develop inside an isolated Docker container:
### Updating VS Code ### Updating VS Code
If you need to update VS Code, you can update the subtree with one line. Here's an example using the version 1.52: To update VS Code, follow these steps:
1. Run `yarn update:vscode`.
2. Enter a version. Ex. 1.53
3. This will open a draft PR for you.
4. There will be merge conflicts. First commit them.
1. We do this because if we don't, it will be impossible to review your PR.
5. Once they're all fixed, test code-server locally and make sure it all works.
```shell #### Notes about Changes
# Add vscode as a new remote if you haven't already and fetch
git remote add -f vscode https://github.com/microsoft/vscode.git
git subtree pull --prefix lib/vscode vscode release/1.52 --squash --message "Update VS Code to 1.52" - watch out for updates to `lib/vscode/src/vs/code/browser/workbench/workbench.html`. You may need to make changes to `src/browser/pages/vscode.html`
```
## Build ## Build