docs: update docs for Code upgrades

This commit is contained in:
Joe Previte 2022-04-26 22:29:10 +00:00
parent 10e9ae9bc1
commit a8eb7ebd1b
1 changed files with 10 additions and 6 deletions

View File

@ -1,5 +1,6 @@
<!-- START doctoc generated TOC please keep comment here to allow auto update --> <!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
# Contributing # Contributing
- [Requirements](#requirements) - [Requirements](#requirements)
@ -96,15 +97,18 @@ re-apply the patches.
### Version updates to Code ### Version updates to Code
1. Update the `lib/vscode` submodule to the desired upstream version branch. 1. Update the `lib/vscode` submodule to the desired upstream version branch.
2. Apply the patches (`quilt push -a`) or restore your stashed changes. At this 1. `cd lib/vscode && git checkout release/1.66`
1. `cd ../../ && git submodule update --recursive`
1. `git add lib && git commit -m "chore: update Code"`
1. Apply the patches (`quilt push -a`) or restore your stashed changes. At this
stage you may need to resolve conflicts. For example use `quilt push -f`, stage you may need to resolve conflicts. For example use `quilt push -f`,
manually apply the rejected portions, then `quilt refresh`. manually apply the rejected portions, then `quilt refresh`.
3. From the code-server **project root**, run `yarn install`. 1. From the code-server **project root**, run `yarn install`.
4. Test code-server locally to make sure everything works. 1. Test code-server locally to make sure everything works.
5. Check the Node.js version that's used by Electron (which is shipped with VS 1. Check the Node.js version that's used by Electron (which is shipped with VS
Code. If necessary, update your version of Node.js to match. Code. If necessary, update your version of Node.js to match.
6. Commit the updated submodule and patches to `code-server`. 1. Commit the updated submodule and patches to `code-server`.
7. Open a PR. 1. Open a PR.
### Patching Code ### Patching Code