From a8eb7ebd1bc03cb9d62603a5a9e2546706e08a91 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Tue, 26 Apr 2022 22:29:10 +0000 Subject: [PATCH] docs: update docs for Code upgrades --- docs/CONTRIBUTING.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index eaa4b736a..7e7269b0a 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -1,5 +1,6 @@ + # Contributing - [Requirements](#requirements) @@ -96,15 +97,18 @@ re-apply the patches. ### Version updates to Code 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`, manually apply the rejected portions, then `quilt refresh`. -3. From the code-server **project root**, run `yarn install`. -4. 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. From the code-server **project root**, run `yarn install`. +1. Test code-server locally to make sure everything works. +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. -6. Commit the updated submodule and patches to `code-server`. -7. Open a PR. +1. Commit the updated submodule and patches to `code-server`. +1. Open a PR. ### Patching Code