Skip to content

Commit 6ae116b

Browse files
committed
Update submodule behaviors.
1 parent 9f28e6c commit 6ae116b

File tree

4 files changed

+7
-148
lines changed

4 files changed

+7
-148
lines changed

.gitmodules

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[submodule "vscode"]
22
path = lib/vscode
3-
url = https://github.com/cdr/vscode.git
4-
branch = 1.60.0-code-server-patch
3+
url = ../vscode.git
4+
branch = code-server
5+
shallow = true

ci/dev/update-vscode.sh

-133
This file was deleted.

docs/CONTRIBUTING.md

+4-11
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,13 @@ yarn watch
7777

7878
### Updates to VS Code
7979

80-
Updating VS Code requires `git subtree`. On some RPM-based Linux distros, `git subtree` is not included by default and needs to be installed separately. To
81-
install, run `dnf install git-subtree` or `yum install git-subtree`.
82-
8380
To update VS Code:
8481

85-
1. Run `yarn update:vscode`.
86-
2. Enter a version (e.g., `1.53`)
87-
3. This will open a draft pull request for you.
88-
4. There will be merge conflicts. Commit them first, since it will be impossible
89-
for us to review your PR if you don't.
90-
5. Fix the conflicts. Then, test code-server locally to make sure everything
91-
works.
92-
6. Check the Node.js version that's used by Electron (which is shipped with VS
82+
1. Run `git submodule update --remote`.
83+
Then, test code-server locally to make sure everything works.
84+
2. Check the Node.js version that's used by Electron (which is shipped with VS
9385
Code. If necessary, update your version of Node.js to match.
86+
3. Open a PR
9487

9588
> Watch for updates to
9689
> `lib/vscode/src/vs/code/browser/workbench/workbench.html`. You may need to

package.json

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
"test:scripts": "./ci/dev/test-scripts.sh",
2424
"package": "./ci/build/build-packages.sh",
2525
"postinstall": "./ci/dev/postinstall.sh",
26-
"update:vscode": "./ci/dev/update-vscode.sh",
27-
"_____": "",
2826
"_audit": "./ci/dev/audit.sh",
2927
"fmt": "./ci/dev/fmt.sh",
3028
"lint": "./ci/dev/lint.sh",

0 commit comments

Comments
 (0)